Merge remote-tracking branch 'lamby/update-debian-packaging'

diff --git a/dak/auto_decruft.py b/dak/auto_decruft.py
index e08e793b11af1d0a6b5b11f9d9d11d950c3a065c..66479a47fd863f155257a37c9d3bfdf61c9d7bdd 100644 (file)
--- a/dak/auto_decruft.py
+++ b/dak/auto_decruft.py
@@ -219,15 +219,15 @@ def auto_decruft_suite(suite_name, suite_id, session, dryrun, debug):
     )
     for group in group_generator:
         group_name = group["name"]
+        pkgs = group["packages"]
+        affected_archs = group["architectures"]
+        # If we remove an arch:all package, then the breakage can occur on any
+        # of the architectures.
+        if "all" in affected_archs:
+            affected_archs = all_architectures
+        for pkg_arch in product(pkgs, affected_archs):
+            pkg_arch2groups[pkg_arch].add(group_name)
         if group_name not in groups:
-            pkgs = group["packages"]
-            affected_archs = group["architectures"]
-            # If we remove an arch:all package, then the breakage can occur on any
-            # of the architectures.
-            if "all" in affected_archs:
-                affected_archs = all_architectures
-            for pkg_arch in product(pkgs, affected_archs):
-                pkg_arch2groups[pkg_arch].add(group_name)
             groups[group_name] = group
             group_order.append(group_name)
         else:

diff --git a/dak/generate_releases.py b/dak/generate_releases.py
index 06ddea6cad41969ab835bc5b44c78ae442d125be..2814b24a61b7ea78eea776367fe518d7fbf1d6dd 100755 (executable)
--- a/dak/generate_releases.py
+++ b/dak/generate_releases.py
@@ -70,7 +70,7 @@ Generate the Release files
   -h, --help                 show this help and exit
   -q, --quiet                Don't output progress
 
-SUITE can be a space seperated list, e.g.
+SUITE can be a space separated list, e.g.
    --suite=unstable testing
   """
     sys.exit(exit_code)
@@ -246,11 +246,11 @@ class ReleaseWriter(object):
                 # If we find a file for which we have a compressed version and
                 # haven't yet seen the uncompressed one, store the possibility
                 # for future use
-                if entry.endswith(".gz") and entry[:-3] not in uncompnotseen:
+                if entry.endswith(".gz") and filename[:-3] not in uncompnotseen:
                     uncompnotseen[filename[:-3]] = (gzip.GzipFile, filename)
-                elif entry.endswith(".bz2") and entry[:-4] not in uncompnotseen:
+                elif entry.endswith(".bz2") and filename[:-4] not in uncompnotseen:
                     uncompnotseen[filename[:-4]] = (bz2.BZ2File, filename)
-                elif entry.endswith(".xz") and entry[:-3] not in uncompnotseen:
+                elif entry.endswith(".xz") and filename[:-3] not in uncompnotseen:
                     uncompnotseen[filename[:-3]] = (XzFile, filename)
 
                 fileinfo[filename]['len'] = len(contents)