diff --git a/britney.py b/britney.py index f3dac30..799a80b 100755 --- a/britney.py +++ b/britney.py @@ -237,7 +237,7 @@ RDEPENDS = 9 RCONFLICTS = 10 -class Britney: +class Britney(object): """Britney, the Debian testing updater script This is the script that updates the testing distribution. It is executed @@ -1067,8 +1067,6 @@ class Britney: # if no package can satisfy the dependency, add this information to the excuse if len(packages) == 0: excuse.addhtml("%s/%s unsatisfiable %s: %s" % (pkg, arch, type, block_txt.strip())) - if arch not in self.options.break_arches.split(): - excuse.add_unsat_dep(arch) continue # for the solving packages, update the excuse to add the dependencies diff --git a/completer.py b/completer.py index 7a2fb3f..cda4eb5 100644 --- a/completer.py +++ b/completer.py @@ -15,7 +15,7 @@ import readline import bisect -class Completer: +class Completer(object): """Completer class This class provides a readline completer for the britney hint-tester diff --git a/excuse.py b/excuse.py index b78d221..9f459d0 100644 --- a/excuse.py +++ b/excuse.py @@ -44,8 +44,6 @@ class Excuse(object): self.name = name self.ver = ("-", "-") self.maint = None - self.pri = None - self.date = None self.urgency = None self.daysold = None self.mindays = None @@ -57,7 +55,6 @@ class Excuse(object): self.deps = {} self.sane_deps = [] self.break_deps = [] - self.unsat_deps = {} self.bugs = [] self.htmlline = [] @@ -90,14 +87,6 @@ class Excuse(object): """Set the section of the package""" self.section = section - def set_priority(self, pri): - """Set the priority of the package""" - self.pri = pri - - def set_date(self, date): - """Set the date of upload of the package""" - self.date = date - def set_urgency(self, date): """Set the urgency of upload of the package""" self.urgency = date @@ -116,10 +105,6 @@ class Excuse(object): if (name, arch) not in self.break_deps: self.break_deps.append( (name, arch) ) - def add_unsat_dep(self, arch): - """Add a flag for unsatisfied dependencies""" - self.unsat_deps[arch] = True - def invalidate_dep(self, name): """Invalidate dependency""" if name not in self.invalid_deps: self.invalid_deps.append(name) diff --git a/hints.py b/hints.py index 07a9ffa..874c1b3 100644 --- a/hints.py +++ b/hints.py @@ -14,7 +14,7 @@ from migrationitem import HintItem -class HintCollection: +class HintCollection(object): def __init__(self): self._hints = [] @@ -35,7 +35,7 @@ class HintCollection: def add_hint(self, hint, user): self._hints.append(Hint(hint, user)) -class Hint: +class Hint(object): def __init__(self, hint, user): self._hint = hint self._user = user