Merge ~litios/ubuntu-cve-tracker:sis-changes-forget-binaries into ubuntu-cve-tracker:master

[David Fernandez Gonzalez]

During the gathering of package information for the USN script generation, when specifying several PPAs, there is a check to always use the most up-to-date version (line 238). The pkg struct is reset to the default state, so everything is regenerated according to this newer version.

Nevertheless, the binaries are not reset. The information is added with the `setdefault` function, so if it already exists, it is not overridden (line 419).

This situation happens when publishing an ESM update when the same package is on the security proposed PPA. The source information in the USN is added from the ESM PPA but the binary information is added from the security proposed PPA. Example:

usn.py --db "$DB" $USN --release bionic --package jhead --source-version 1:3.00-8~ubuntu0.2+esm1
usn.py --db "$DB" $USN --release focal --package jhead --source-version 1:3.04-1ubuntu0.2+esm1
usn.py --db "$DB" $USN --release jammy --package jhead --source-version 1:3.06.0.1-2ubuntu0.22.04.1+esm1
[...]
usn.py --db "$DB" $USN --release bionic --package jhead --binary-version 1:3.00-8~ubuntu0.2 --pocket security
usn.py --db "$DB" $USN --release focal --package jhead --binary-version 1:3.04-1ubuntu0.2 --pocket security
usn.py --db "$DB" $USN --release jammy --package jhead --binary-version 1:3.06.0.1-2ubuntu0.22.04.1 --pocket security

To follow the same logic as what's already done in line 238, this PR also cleans the binaries when it detects there is a newer version.

Thanks @iosifache for detecting the issue!

[Alex Murray (alexmurray)]

LGTM!

review: Approve

diff --git a/scripts/sis-changes b/scripts/sis-changes
index bf50c92..db82bf4 100755
--- a/scripts/sis-changes
+++ b/scripts/sis-changes
@@ -237,6 +237,7 @@ def load_pkg_details_from_lp(archive, pkgs, binaries, pkg, item):
         else:
             print("Forgetting %s: %s %s (now have %s)" % (rel, pkg, pkgs[pkg][rel]['source']['version'], version), file=sys.stderr)
             pkgs[pkg][rel] = dict()
+            binaries[pkg][rel] = dict()
     pkgs.setdefault(pkg, dict())
     pkgs[pkg].setdefault(rel, dict())
     if opt.debug: