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

Fix build-dep check for source with only arch: all binaries

Browse Source 
When a source has only arch: all binaries, the Build-Depends had no relevant
architectures, so the check was skipped. Instead check it on any architecture,
just like Build-Depends-Indep.

Signed-off-by: Ivo De Decker <ivodd@debian.org>
This commit is contained in:
Ivo De Decker 2019-01-18 20:34:58 +00:00
parent 15e5228669
commit cd08deb943
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
britney2/policies/policy.py
View File

@ -841,6 +841,7 @@ class BuildDependsPolicy(BasePolicy):
def _check_build_deps(self, deps, dep_type, build_deps_info, suite, source_name, source_data_tdist, source_data_srcdist, excuse, def _check_build_deps(self, deps, dep_type, build_deps_info, suite, source_name, source_data_tdist, source_data_srcdist, excuse,
get_dependency_solvers=get_dependency_solvers): get_dependency_solvers=get_dependency_solvers):
verdict = PolicyVerdict.PASS verdict = PolicyVerdict.PASS
any_arch_ok = dep_type == DependencyType.BUILD_DEPENDS_INDEP
britney = self._britney britney = self._britney
@ -863,6 +864,12 @@ class BuildDependsPolicy(BasePolicy):
result_archs = defaultdict(list) result_archs = defaultdict(list)
bestresult = BuildDepResult.FAILED bestresult = BuildDepResult.FAILED
check_archs = self._get_check_archs(relevant_archs,dep_type); check_archs = self._get_check_archs(relevant_archs,dep_type);
if not check_archs:
# when the arch list is empty, we check the b-d on any arch, instead of all archs
# this happens for Build-Depens on a source package that only produces arch: all binaries
any_arch_ok = True
check_archs = self._get_check_archs(self.options.architectures,DependencyType.BUILD_DEPENDS_INDEP);
for arch in check_archs: for arch in check_archs:
# retrieve the binary package from the specified suite and arch # retrieve the binary package from the specified suite and arch
binaries_s_a = binaries_s[arch] binaries_s_a = binaries_s[arch]
@ -907,7 +914,7 @@ class BuildDependsPolicy(BasePolicy):
if arch_results[arch] < BuildDepResult.DEPENDS: if arch_results[arch] < BuildDepResult.DEPENDS:
arch_results[arch] = BuildDepResult.DEPENDS arch_results[arch] = BuildDepResult.DEPENDS
if dep_type == DependencyType.BUILD_DEPENDS_INDEP: if any_arch_ok:
if arch_results[arch] < bestresult: if arch_results[arch] < bestresult:
bestresult = arch_results[arch] bestresult = arch_results[arch]
result_archs[arch_results[arch]].append(arch) result_archs[arch_results[arch]].append(arch)
@ -916,10 +923,11 @@ class BuildDependsPolicy(BasePolicy):
# satisfied in the target suite, so we can stop # satisfied in the target suite, so we can stop
break break
if dep_type == DependencyType.BUILD_DEPENDS_INDEP: if any_arch_ok:
arch = result_archs[bestresult][0] arch = result_archs[bestresult][0]
excuse.addhtml("Checking %s on %s"%(dep_type.get_description(),arch)) excuse.addhtml("Checking %s on %s"%(dep_type.get_description(),arch))
build_deps_info['check-indep-build-depends-on-arch'] = arch key = "check-%s-on-arch" % dep_type.get_reason()
build_deps_info[key] = arch
verdict = self._add_info_for_arch(arch, excuses_info, blockers, arch_results, dep_type, target_suite, source_suite, excuse, verdict) verdict = self._add_info_for_arch(arch, excuses_info, blockers, arch_results, dep_type, target_suite, source_suite, excuse, verdict)
else: else: