Skip to content

fix(rpm): prevent location element from overwriting canonical package name in dot file #370

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
arodage wants to merge 7 commits into from
Closed

fix(rpm): prevent location element from overwriting canonical package name in dot file #370

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
988b558
fix(rpm): prevent location element from overwriting canonical package…
arodage Jan 28, 2026
ea25aca
fix(rpm): fix package name handling and cache lookup
arodage Jan 28, 2026
6bacfea
fix(rpm): update unit tests to expect canonical names instead of file…
arodage Jan 28, 2026
2824a51
fix(rpm): correct location element handling to never overwrite canoni…
arodage Jan 28, 2026
f99dd9b
Merge branch 'main' into fix/rpm-package-name-location-override
arodage Jan 30, 2026
725d58f
fix(rpm): trim whitespace from package names parsed from XML metadata
arodage Jan 30, 2026
22ee25b
fix(rpm): check Provides field when matching top-level packages
arodage Jan 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/ospackage/rpmutils/download.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ func DownloadPackagesComplete(pkgList []string, destDir, dotFile string, pkgSour
urls := make([]string, len(sorted_pkgs))
for i, pkg := range sorted_pkgs {
urls[i] = pkg.URL
downloadPkgList = append(downloadPkgList, pkg.Name)
downloadPkgList = append(downloadPkgList, filepath.Base(pkg.URL))
}

// Ensure dest directory exists
Expand Down
5 changes: 2 additions & 3 deletions internal/ospackage/rpmutils/resolver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"fmt"
"io"
"os"
"path"
"path/filepath"
"sort"
"strings"
Expand Down Expand Up @@ -254,11 +253,11 @@ func ParseRepositoryMetadata(baseURL, gzHref string) ([]ospackage.PackageInfo, e
}

case "location":
// read the href and build full URL + infer Name (filename)
// read the href and build full URL
for _, a := range elem.Attr {
if a.Name.Local == "href" {
curInfo.URL = strings.TrimRight(baseURL, "/") + "/" + strings.TrimLeft(a.Value, "/")
curInfo.Name = path.Base(a.Value)
// Note: Don't set Name from location href - it should come from <name> element
break
}
}
Expand Down
6 changes: 3 additions & 3 deletions internal/ospackage/rpmutils/resolver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ func TestParsePrimary(t *testing.T) {
filename: "primary.xml.gz",
expectedError: false,
expectedCount: 2,
expectedNames: []string{"bash-5.1-8.el9.x86_64.rpm", "glibc-2.32-1.el9.x86_64.rpm"},
expectedNames: []string{"bash", "glibc"},
},
{
name: "empty metadata",
Expand Down Expand Up @@ -330,13 +330,13 @@ func TestParsePrimary(t *testing.T) {
// Check bash package details
var bashPkg *ospackage.PackageInfo
for _, pkg := range packages {
if pkg.Name == "bash-5.1-8.el9.x86_64.rpm" {
if pkg.Name == "bash" {
bashPkg = &pkg
break
}
}
if bashPkg == nil {
t.Fatal("bash-5.1-8.el9.x86_64.rpm package not found")
t.Fatal("bash package not found")
}

if bashPkg.License != "GPLv3+" {
Expand Down
Loading