Compare commits

..

No commits in common. "main" and "v1.42.0" have entirely different histories.

2 changed files with 2 additions and 16 deletions

View File

@ -84,13 +84,13 @@ func newMetadataFromManifestLine(entry string) (*pkg.RpmDBEntry, error) {
}, nil }, nil
} }
// packageURL returns the PURL for the specific RHEL or Hummingbird package (see https://github.com/package-url/purl-spec) // packageURL returns the PURL for the specific RHEL package (see https://github.com/package-url/purl-spec)
func packageURL(name, arch string, epoch *int, srpm string, version, release string, distro *linux.Release) string { func packageURL(name, arch string, epoch *int, srpm string, version, release string, distro *linux.Release) string {
var namespace string var namespace string
if distro != nil { if distro != nil {
namespace = distro.ID namespace = distro.ID
} }
if namespace == "rhel" || namespace == "hummingbird" { if namespace == "rhel" {
namespace = "redhat" namespace = "redhat"
} }
if strings.HasPrefix(namespace, "opensuse") { if strings.HasPrefix(namespace, "opensuse") {

View File

@ -55,20 +55,6 @@ func Test_packageURL(t *testing.T) {
}, },
expected: "pkg:rpm/p@v-r", expected: "pkg:rpm/p@v-r",
}, },
{
name: "hummingbird distro maps to redhat namespace",
distro: &linux.Release{
ID: "hummingbird",
VersionID: "1.0",
},
metadata: pkg.RpmDBEntry{
Name: "p",
Version: "v",
Release: "r",
Epoch: nil,
},
expected: "pkg:rpm/redhat/p@v-r?distro=hummingbird-1.0",
},
{ {
name: "with upstream source rpm info", name: "with upstream source rpm info",
distro: &linux.Release{ distro: &linux.Release{