Merge ~emitorino/ubuntu-cve-tracker:fix_pocket_assignment_into_publish_usn_to_website_api into ubuntu-cve-tracker:master

Proposed by Emilia Torino
Status: Merged
Merged at revision: cc7efd2664b0841685019273c05b90e95071cc7b
Proposed branch: ~emitorino/ubuntu-cve-tracker:fix_pocket_assignment_into_publish_usn_to_website_api
Merge into: ubuntu-cve-tracker:master
Diff against target: 27 lines (+5/-4)
1 file modified
scripts/publish-usn-to-website-api.py (+5/-4)
Reviewer Review Type Date Requested Status
Steve Beattie Approve
Review via email: mp+401877@code.launchpad.net

Commit message

- fixing pocket info not being properly assigned

Description of the change

After the latest changes introduced to support setting pocket into USNs, the publish-usn-to-website-api.py fails with:

$ $UCT/scripts/publish-usn-to-website-api.py --action update --json ~/development/esm_beta_support/usn_json/4811-1.json
Traceback (most recent call last):
  File "/home/emitorino/development/ubuntu-cve-tracker/scripts/publish-usn-to-website-api.py", line 196, in <module>
    release_packages[codename]["pocket"] = info["pocket"]
TypeError: list indices must be integers or slices, not str

This is because info["pocket"] is incorrectly being assigned to the release_packages[codename] list and should be set inside the earlier generated dict instead.

To post a comment you must log in.
Revision history for this message
Paulo Flabiano Smorigo (pfsmorigo) wrote :

LGTM

Revision history for this message
Steve Beattie (sbeattie) wrote :

Nice catch, thanks for fixing. Merging/

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/scripts/publish-usn-to-website-api.py b/scripts/publish-usn-to-website-api.py
2index bdc1c39..d876eef 100755
3--- a/scripts/publish-usn-to-website-api.py
4+++ b/scripts/publish-usn-to-website-api.py
5@@ -183,17 +183,18 @@ for notice_id, notice in payload:
6 else:
7 source_link = ""
8 version_link = ""
9- release_packages[codename].append(
10- {
11+ release_package_info = {
12 "name": name,
13 "version": info["version"],
14 "is_source": "false",
15 "source_link": source_link,
16 "version_link": version_link,
17 }
18- )
19 if "pocket" in info:
20- release_packages[codename]["pocket"] = info["pocket"]
21+ release_package_info["pocket"] = info["pocket"]
22+
23+ release_packages[codename].append(release_package_info)
24+
25 # format CVEs and references
26 cves = []
27 references = []

Subscribers

People subscribed via source and target branches