From da9e838067587f1827867c0dfff9d65dfd6771d9 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Wed, 12 Nov 2014 12:36:53 +0000 Subject: [PATCH] Revert to r414; this gets things wrong if there are sources with some Architecture: all binaries in unstable and some incompletely-built architecture-dependent ones. --- britney.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/britney.py b/britney.py index 33c99f6..05ffc04 100755 --- a/britney.py +++ b/britney.py @@ -625,24 +625,16 @@ 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"): + if current_arch in ( + target_value[ARCHITECTURE], "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: