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

Rename new excuse field and method to unsatisfiable_on_archs and add_unsatisfiable_on_arch

Browse Source
This commit is contained in:
Paul Gevers 2017-10-24 22:03:34 +02:00
parent a16e4e5a55
commit 089c4f6e57
No known key found for this signature in database
GPG Key ID: 9C5C99EB05BD750A
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
britney.py
View File

@ -1058,7 +1058,7 @@ class Britney(object):
if not packages: if not packages:
excuse.addhtml("%s/%s unsatisfiable Depends: %s" % (pkg, arch, block_txt.strip())) excuse.addhtml("%s/%s unsatisfiable Depends: %s" % (pkg, arch, block_txt.strip()))
excuse.addreason("depends") excuse.addreason("depends")
excuse.add_depends_breaks_arch(arch) excuse.add_unsatisfiable_on_arch(arch)
if arch not in self.options.break_arches: if arch not in self.options.break_arches:
is_all_ok = False is_all_ok = False
continue continue

10
britney2/excuse.py
View File

@ -78,7 +78,7 @@ class Excuse(object):
self.deps = {} self.deps = {}
self.sane_deps = [] self.sane_deps = []
self.break_deps = [] self.break_deps = []
self.break_arch = [] self.unsatisfiable_on_archs = []
self.bugs = [] self.bugs = []
self.newbugs = set() self.newbugs = set()
self.oldbugs = set() self.oldbugs = set()
@ -140,10 +140,10 @@ class Excuse(object):
if (name, arch) not in self.break_deps: if (name, arch) not in self.break_deps:
self.break_deps.append( (name, arch) ) self.break_deps.append( (name, arch) )
def add_depends_breaks_arch(self, arch): def add_unsatisfiable_on_arch(self, arch):
"""Add an arch that breaks by dependency""" """Add an arch that has unsatisfiable dependencies"""
if arch not in self.break_arch: if arch not in self.unsatisfiable_on_archs:
self.break_arch.append(arch) self.unsatisfiable_on_archs.append(arch)
def invalidate_dep(self, name): def invalidate_dep(self, name):
"""Invalidate dependency""" """Invalidate dependency"""

2
britney2/policies/autopkgtest.py
View File

@ -197,7 +197,7 @@ class AutopkgtestPolicy(BasePolicy):
if arch in excuse.missing_builds: if arch in excuse.missing_builds:
verdict = PolicyVerdict.REJECTED_TEMPORARILY verdict = PolicyVerdict.REJECTED_TEMPORARILY
self.log('%s hasn''t been built on arch %s, delay autopkgtest there' % (source_name, arch)) self.log('%s hasn''t been built on arch %s, delay autopkgtest there' % (source_name, arch))
elif arch in excuse.break_arch: elif arch in excuse.unsatisfiable_on_archs:
verdict = PolicyVerdict.REJECTED_TEMPORARILY verdict = PolicyVerdict.REJECTED_TEMPORARILY
self.log('%s is uninstallable on arch %s, delay autopkgtest there' % (source_name, arch)) self.log('%s is uninstallable on arch %s, delay autopkgtest there' % (source_name, arch))
else: else: