Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-06-02 21:32:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sort some data for deterministic output in excuses

Browse Source 
Signed-off-by: Ivo De Decker <ivodd@debian.org>
This commit is contained in:
Ivo De Decker 2019-01-16 19:17:58 +00:00
parent f928c7ed3d
commit 97ed917db4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
britney.py
View File

@ -780,7 +780,7 @@ class Britney(object):
# check if the block can be satisfied in the source suite, and list the solving packages # check if the block can be satisfied in the source suite, and list the solving packages
packages = get_dependency_solvers(block, binaries_s_a, provides_s_a) packages = get_dependency_solvers(block, binaries_s_a, provides_s_a)
packages = [p.source for p in packages] packages = sorted(p.source for p in packages)
# if the dependency can be satisfied by the same source package, skip the block: # if the dependency can be satisfied by the same source package, skip the block:
# obviously both binary packages will enter testing together # obviously both binary packages will enter testing together
@ -1090,7 +1090,7 @@ class Britney(object):
break break
all_binaries = self.all_binaries all_binaries = self.all_binaries
for pkg_id in source_u.binaries: for pkg_id in sorted(source_u.binaries):
is_valid = self.excuse_unsat_deps(pkg_id.package_name, src, pkg_id.architecture, source_suite, excuse) is_valid = self.excuse_unsat_deps(pkg_id.package_name, src, pkg_id.architecture, source_suite, excuse)
if is_valid: if is_valid:
continue continue
@ -1151,7 +1151,7 @@ class Britney(object):
# in the `outofsync_arches' list, then do not block the update # in the `outofsync_arches' list, then do not block the update
if oodbins: if oodbins:
oodtxt = "" oodtxt = ""
for v in oodbins: for v in sorted(oodbins):
if oodtxt: oodtxt = oodtxt + "; " if oodtxt: oodtxt = oodtxt + "; "
oodtxt = oodtxt + "%s (from <a href=\"https://buildd.debian.org/status/logs.php?" \ oodtxt = oodtxt + "%s (from <a href=\"https://buildd.debian.org/status/logs.php?" \
"arch=%s&pkg=%s&ver=%s\" target=\"_blank\">%s</a>)" % \ "arch=%s&pkg=%s&ver=%s\" target=\"_blank\">%s</a>)" % \

2
britney2/policies/policy.py
View File

@ -882,7 +882,7 @@ class BuildDependsPolicy(BasePolicy):
# check if the block can be satisfied in the source suite, and list the solving packages # check if the block can be satisfied in the source suite, and list the solving packages
packages = get_dependency_solvers(block, binaries_s_a, provides_s_a, build_depends=True) packages = get_dependency_solvers(block, binaries_s_a, provides_s_a, build_depends=True)
packages = [p.source for p in packages] packages = sorted(p.source for p in packages)
# if the dependency can be satisfied by the same source package, skip the block: # if the dependency can be satisfied by the same source package, skip the block:
# obviously both binary packages will enter the target suite together # obviously both binary packages will enter the target suite together