Merge ~emitorino/usn-tool:fix_usn_similarity_to_consider_old_usns into usn-tool:master

[Emilia Torino]

- usn.py: check is sources key is present before comparing USNs in usn_similar

While trying to publish the updates to the USNs related to fixing terms which could be non-inclusive, usn.py failed to compare USNs when sources key is not present. This happens only with old USNs: 126-1, 149-1, 152-1, 155-1, 204-1, 30-1, 363-1, 412-1 and 483-1.

If needed we can add the sources to those USNs as well, but the check seems correct anyways for the script to not fail like it is failing now:

Traceback (most recent call last):
  File "/home/ubuntu-security/git-pulls/usn-tool/usn.py", line 699, in <module>
    output = main(sys.argv[1:])
  File "/home/ubuntu-security/git-pulls/usn-tool/usn.py", line 573, in main
    if key in database and not usn_similar(data[key], database[key]) != 0:
  File "/home/ubuntu-security/git-pulls/usn-tool/usn.py", line 549, in usn_similar
    if set(old['releases'][rel]['sources'].keys()) != set(new['releases'][rel]['sources'].keys()):
KeyError: 'sources'

[Alex Murray (alexmurray)]

LGTM!

review: Approve

diff --git a/usn.py b/usn.py
index 17fc033..673f3f2 100755
--- a/usn.py
+++ b/usn.py
@@ -546,11 +546,15 @@ def usn_similar(old, new):
     if set(old['releases'].keys()) != set(new['releases'].keys()):
         return False
     for rel in old['releases'].keys():
-        if set(old['releases'][rel]['sources'].keys()) != set(new['releases'][rel]['sources'].keys()):
-            return False
-        for src in old['releases'][rel]['sources']:
-            if old['releases'][rel]['sources'][src]['version'] != new['releases'][rel]['sources'][src]['version']:
+        # Old USNs might not have the source packages information
+        if 'sources' in old['releases'][rel]:
+            if set(old['releases'][rel]['sources'].keys()) != set(new['releases'][rel]['sources'].keys()):
                 return False
+            for src in old['releases'][rel]['sources']:
+                if old['releases'][rel]['sources'][src]['version'] != new['releases'][rel]['sources'][src]['version']:
+                    return False
+        else:
+            print("WARNING: no source packages information available in %s" % old["id"])
     return True