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.

bzr-import-20160707
Colin Watson 10 years ago
parent 301dd2df1e
commit da9e838067

@ -625,24 +625,16 @@ class Britney(object):
if source_version != target_version: if source_version != target_version:
current_arch = value[ARCHITECTURE] current_arch = value[ARCHITECTURE]
built = False built = False
any_arch_indep = False
any_arch_dep = False
for b in target_sources[value[SOURCE]][BINARIES]: for b in target_sources[value[SOURCE]][BINARIES]:
binpkg, binarch = b.split('/') binpkg, binarch = b.split('/')
if binarch == arch: if binarch == arch:
target_value = target_binaries[binpkg] target_value = target_binaries[binpkg]
target_arch = target_value[ARCHITECTURE] if current_arch in (
if current_arch in (target_arch, "all"): target_value[ARCHITECTURE], "all"):
built = True built = True
break break
if target_arch == "all":
any_arch_indep = True
else:
any_arch_dep = True
if built: if built:
continue continue
if any_arch_indep and not any_arch_dep:
continue
oodsrcs.add(value[SOURCE]) oodsrcs.add(value[SOURCE])
if pkg in target_binaries: if pkg in target_binaries:

Loading…
Cancel
Save