Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-05-17 21:41:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refine merging of binaries: only count unstable-architecture-independent as built if all binaries are now architecture-independent.

Browse Source
This commit is contained in:
Colin Watson 2014-11-12 12:17:50 +00:00
parent 4cc353296a
commit 301dd2df1e
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
britney.py
View File

@ -625,17 +625,24 @@ 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] target_arch = target_value[ARCHITECTURE]
if (current_arch in (target_arch, "all") or if current_arch in (target_arch, "all"):
target_arch == "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: