From: Niels Thykier Date: Fri, 4 Sep 2015 15:16:37 +0000 (+0200) Subject: auto-decruft: Register all members of groups when merging groups X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=be1e0fd28f4000cb6717d52f9ef8fda9da6bb920;p=dak.git auto-decruft: Register all members of groups when merging groups 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 --- diff --git a/dak/auto_decruft.py b/dak/auto_decruft.py index e08e793b..66479a47 100644 --- 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: