]> git.decadent.org.uk Git - dak.git/commitdiff
auto-decruft: Register all members of groups when merging groups
authorNiels Thykier <niels@thykier.net>
Fri, 4 Sep 2015 15:16:37 +0000 (17:16 +0200)
committerNiels Thykier <niels@thykier.net>
Fri, 4 Sep 2015 15:18:31 +0000 (17:18 +0200)
When merging two groups of auto-decruftable packages, remember to
register all members of the combined group so dak can do a reverse
look up later.

Signed-off-by: Niels Thykier <niels@thykier.net>
dak/auto_decruft.py

index e08e793b11af1d0a6b5b11f9d9d11d950c3a065c..66479a47fd863f155257a37c9d3bfdf61c9d7bdd 100644 (file)
@@ -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: