diff --git a/pkg/types/types.go b/pkg/types/types.go index e36e351d..e33b7627 100644 --- a/pkg/types/types.go +++ b/pkg/types/types.go @@ -116,7 +116,7 @@ type Advisory struct { FixedVersion string `json:",omitempty"` AffectedVersion string `json:",omitempty"` // Only for Arch Linux - // Advisory can contain different fixed versions for different architectures/flavors(see Oracle Linux) + // Advisory can contain different fixed versions for different architectures FixedVersions FixedVersions `json:",omitempty"` // MajorVersion ranges for language-specific package @@ -138,7 +138,6 @@ type FixedVersion struct { FixedVersion string Arch string VendorID string - Flavor string // For Oracle Linux: (fips, ksplice1, etc...) } type Vulnerability struct { @@ -162,7 +161,6 @@ type Ecosystem string func (versions FixedVersions) IsDuplicate(ver FixedVersion) bool { for _, version := range versions { if version.FixedVersion == ver.FixedVersion && - version.Flavor == ver.Flavor && version.Arch == ver.Arch && version.VendorID == ver.VendorID { return true diff --git a/pkg/vulnsrc/rocky/rocky.go b/pkg/vulnsrc/rocky/rocky.go index bffbc4b9..ca59c811 100644 --- a/pkg/vulnsrc/rocky/rocky.go +++ b/pkg/vulnsrc/rocky/rocky.go @@ -161,7 +161,7 @@ func (vs *VulnSrc) commit(tx *bolt.Tx, platformName string, errata []RLSA) error VendorID: erratum.ID, } - // if advisory for this package and CVE was saved - add new architecture + // if the advisory for this package and CVE have been kept - just add the new architecture if adv, ok := input.Advisories[pkg.Name]; ok { // don't include duplicates if !adv.FixedVersions.IsDuplicate(fixedVersion) {