From 089c4f6e573d92b5d43d1289b40c6de9510aa850 Mon Sep 17 00:00:00 2001 From: Paul Gevers Date: Tue, 24 Oct 2017 22:03:34 +0200 Subject: [PATCH] Rename new excuse field and method to unsatisfiable_on_archs and add_unsatisfiable_on_arch --- britney.py | 2 +- britney2/excuse.py | 10 +++++----- britney2/policies/autopkgtest.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/britney.py b/britney.py index b840a1f..9e21b59 100755 --- a/britney.py +++ b/britney.py @@ -1058,7 +1058,7 @@ class Britney(object): if not packages: excuse.addhtml("%s/%s unsatisfiable Depends: %s" % (pkg, arch, block_txt.strip())) excuse.addreason("depends") - excuse.add_depends_breaks_arch(arch) + excuse.add_unsatisfiable_on_arch(arch) if arch not in self.options.break_arches: is_all_ok = False continue diff --git a/britney2/excuse.py b/britney2/excuse.py index 81d7781..c4c816f 100644 --- a/britney2/excuse.py +++ b/britney2/excuse.py @@ -78,7 +78,7 @@ class Excuse(object): self.deps = {} self.sane_deps = [] self.break_deps = [] - self.break_arch = [] + self.unsatisfiable_on_archs = [] self.bugs = [] self.newbugs = set() self.oldbugs = set() @@ -140,10 +140,10 @@ class Excuse(object): if (name, arch) not in self.break_deps: self.break_deps.append( (name, arch) ) - def add_depends_breaks_arch(self, arch): - """Add an arch that breaks by dependency""" - if arch not in self.break_arch: - self.break_arch.append(arch) + def add_unsatisfiable_on_arch(self, arch): + """Add an arch that has unsatisfiable dependencies""" + if arch not in self.unsatisfiable_on_archs: + self.unsatisfiable_on_archs.append(arch) def invalidate_dep(self, name): """Invalidate dependency""" diff --git a/britney2/policies/autopkgtest.py b/britney2/policies/autopkgtest.py index fc5f82f..c73be00 100644 --- a/britney2/policies/autopkgtest.py +++ b/britney2/policies/autopkgtest.py @@ -197,7 +197,7 @@ class AutopkgtestPolicy(BasePolicy): if arch in excuse.missing_builds: verdict = PolicyVerdict.REJECTED_TEMPORARILY 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 self.log('%s is uninstallable on arch %s, delay autopkgtest there' % (source_name, arch)) else: