arno/clair
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updater: ensure that ubuntu's notes are unique

Browse Source
This commit is contained in:
Quentin Machu 2016-01-25 13:19:49 -05:00 committed by Jimmy Zelinskie
parent d3d689a26a
commit 8e852348a1
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
updater/fetchers/ubuntu/ubuntu.go
View File

@ -132,6 +132,7 @@ func (fetcher *UbuntuFetcher) FetchUpdate(datastore database.Datastore) (resp up
return resp, err return resp, err
} }
notes := make(map[string]struct{})
for cvePath := range modifiedCVE { for cvePath := range modifiedCVE {
// Open the CVE file. // Open the CVE file.
file, err := os.Open(repositoryLocalPath + "/" + cvePath) file, err := os.Open(repositoryLocalPath + "/" + cvePath)
@ -150,11 +151,10 @@ func (fetcher *UbuntuFetcher) FetchUpdate(datastore database.Datastore) (resp up
// Add the vulnerability to the response, splitting it by Namespaces. // Add the vulnerability to the response, splitting it by Namespaces.
resp.Vulnerabilities = append(resp.Vulnerabilities, updater.DoVulnerabilityNamespacing(v)...) resp.Vulnerabilities = append(resp.Vulnerabilities, updater.DoVulnerabilityNamespacing(v)...)
// Log any unknown releases. // Store any unknown releases as notes.
for k := range unknownReleases { for k := range unknownReleases {
note := fmt.Sprintf("Ubuntu %s is not mapped to any version number (eg. trusty->14.04). Please update me.", k) note := fmt.Sprintf("Ubuntu %s is not mapped to any version number (eg. trusty->14.04). Please update me.", k)
resp.Notes = append(resp.Notes, note) notes[note] = struct{}{}
log.Warning(note)
// If we encountered unknown Ubuntu release, we don't want the revision // If we encountered unknown Ubuntu release, we don't want the revision
// number to be considered as managed. // number to be considered as managed.
@ -170,9 +170,12 @@ func (fetcher *UbuntuFetcher) FetchUpdate(datastore database.Datastore) (resp up
file.Close() file.Close()
} }
// Add flag information // Add flag and notes.
resp.FlagName = ubuntuUpdaterFlag resp.FlagName = ubuntuUpdaterFlag
resp.FlagValue = strconv.Itoa(revisionNumber) resp.FlagValue = strconv.Itoa(revisionNumber)
for note := range notes {
resp.Notes = append(resp.Notes, note)
}
return return
} }