Ubuntu CVE Tracker

Merge ~alexmurray/ubuntu-cve-tracker:sis-generate-usn-warn-to-reduce-binaries into ubuntu-cve-tracker:master

  1. Git
  2. lp:~alexmurray/ubuntu-cve-tracker
  3. sis-generate-usn-warn-to-reduce-binaries
  4. Merge into master
Proposed by Alex Murray
Status: Merged
Merged at revision: 1a21faed3874edb39c188bd81b8d53e3e5e70663
Proposed branch: ~alexmurray/ubuntu-cve-tracker:sis-generate-usn-warn-to-reduce-binaries
Merge into: ubuntu-cve-tracker:master
Diff against target: 40 lines (+4/-4)
1 file modified
scripts/sis-generate-usn (+4/-4)
Reviewer Review Type Date Requested Status
Amir Naseredini Approve
David Fernandez Gonzalez Approve
Ubuntu Security Team Pending
Review via email: mp+438499@code.launchpad.net
To post a comment you must log in.
Revision history for this message
David Fernandez Gonzalez (litios) wrote :

Lgtm, thanks!

review: Approve
Revision history for this message
Amir Naseredini (sahnaseredini) :
Revision history for this message
Amir Naseredini (sahnaseredini) wrote :

Great, thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/scripts/sis-generate-usn b/scripts/sis-generate-usn
2index 8fa14c2..de70fba 100755
3--- a/scripts/sis-generate-usn
4+++ b/scripts/sis-generate-usn
5@@ -247,7 +247,7 @@ def find_archive_path_one_release(source, release, arch, filename, fuzzy=None):
6 # non-deb: stored in the source package's location
7 try:
8 base = os.path.join(src_locations[release][arch][source], prefix, source, filename)
9- except KeyError as e:
10+ except KeyError:
11 raise KeyError("cannot find %s path for %s %s/%s/%s" % (arch, release, prefix, source, filename))
12 filepath = os.path.join(pool, base)
13 return filepath, base
14@@ -878,7 +878,7 @@ print()
15
16 # Affected Binaries
17 for release in releases:
18- print('# Reduce to minimum binaries affected in %s' % (release))
19+ print('# XXX Reduce to minimum binaries affected in %s' % (release))
20 for source in sorted(info[release].keys()):
21 version = info[release][source]['version']
22 for deb in sorted(info[release][source]['binaries']):
23@@ -893,7 +893,7 @@ for release in releases:
24 if source in binaries and release in binaries[source] and deb in binaries[source][release]:
25 try:
26 version = binaries[source][release][deb]['version']
27- except KeyError as e:
28+ except KeyError:
29 pass
30 if not filter_dbg.search(deb) and (not opt.filter_bins or opt.filter_bins.search(deb)):
31 pocket = ""
32@@ -944,7 +944,7 @@ for release in releases:
33 if source in binaries and release in binaries[source] and deb in binaries[source][release]:
34 try:
35 version = binaries[source][release][deb]['version']
36- except KeyError as e:
37+ except KeyError:
38 pass
39 if not filter_dbg.search(deb):
40 pocket = ""

Subscribers

People subscribed via source and target branches