From 301dd2df1e1e5f706da9071344da1d4777606426 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Wed, 12 Nov 2014 12:17:50 +0000 Subject: [PATCH] Refine merging of binaries: only count unstable-architecture-independent as built if all binaries are now architecture-independent. --- britney.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/britney.py b/britney.py index b4f26fc..33c99f6 100755 --- a/britney.py +++ b/britney.py @@ -625,17 +625,24 @@ class Britney(object): if source_version != target_version: current_arch = value[ARCHITECTURE] built = False + any_arch_indep = False + any_arch_dep = False for b in target_sources[value[SOURCE]][BINARIES]: binpkg, binarch = b.split('/') if binarch == arch: target_value = target_binaries[binpkg] target_arch = target_value[ARCHITECTURE] - if (current_arch in (target_arch, "all") or - target_arch == "all"): + if current_arch in (target_arch, "all"): built = True break + if target_arch == "all": + any_arch_indep = True + else: + any_arch_dep = True if built: continue + if any_arch_indep and not any_arch_dep: + continue oodsrcs.add(value[SOURCE]) if pkg in target_binaries: