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

Merge branch 'master' of file:///srv/release.debian.org/git/britney2

Browse Source
This commit is contained in:
Adam D. Barratt 2012-01-08 12:36:03 +00:00
commit 081cd9afdb
4 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
britney.py
View File

@ -237,7 +237,7 @@ RDEPENDS = 9
RCONFLICTS = 10 RCONFLICTS = 10
class Britney: class Britney(object):
"""Britney, the Debian testing updater script """Britney, the Debian testing updater script
This is the script that updates the testing distribution. It is executed 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 no package can satisfy the dependency, add this information to the excuse
if len(packages) == 0: if len(packages) == 0:
excuse.addhtml("%s/%s unsatisfiable %s: %s" % (pkg, arch, type, block_txt.strip())) 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 continue
# for the solving packages, update the excuse to add the dependencies # for the solving packages, update the excuse to add the dependencies

2
completer.py
View File

@ -15,7 +15,7 @@
import readline import readline
import bisect import bisect
class Completer: class Completer(object):
"""Completer class """Completer class
This class provides a readline completer for the britney hint-tester This class provides a readline completer for the britney hint-tester

15
excuse.py
View File

@ -44,8 +44,6 @@ class Excuse(object):
self.name = name self.name = name
self.ver = ("-", "-") self.ver = ("-", "-")
self.maint = None self.maint = None
self.pri = None
self.date = None
self.urgency = None self.urgency = None
self.daysold = None self.daysold = None
self.mindays = None self.mindays = None
@ -57,7 +55,6 @@ class Excuse(object):
self.deps = {} self.deps = {}
self.sane_deps = [] self.sane_deps = []
self.break_deps = [] self.break_deps = []
self.unsat_deps = {}
self.bugs = [] self.bugs = []
self.htmlline = [] self.htmlline = []
@ -90,14 +87,6 @@ class Excuse(object):
"""Set the section of the package""" """Set the section of the package"""
self.section = section 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): def set_urgency(self, date):
"""Set the urgency of upload of the package""" """Set the urgency of upload of the package"""
self.urgency = date self.urgency = date
@ -116,10 +105,6 @@ 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_unsat_dep(self, arch):
"""Add a flag for unsatisfied dependencies"""
self.unsat_deps[arch] = True
def invalidate_dep(self, name): def invalidate_dep(self, name):
"""Invalidate dependency""" """Invalidate dependency"""
if name not in self.invalid_deps: self.invalid_deps.append(name) if name not in self.invalid_deps: self.invalid_deps.append(name)

4
hints.py
View File

@ -14,7 +14,7 @@
from migrationitem import HintItem from migrationitem import HintItem
class HintCollection: class HintCollection(object):
def __init__(self): def __init__(self):
self._hints = [] self._hints = []
@ -35,7 +35,7 @@ class HintCollection:
def add_hint(self, hint, user): def add_hint(self, hint, user):
self._hints.append(Hint(hint, user)) self._hints.append(Hint(hint, user))
class Hint: class Hint(object):
def __init__(self, hint, user): def __init__(self, hint, user):
self._hint = hint self._hint = hint
self._user = user self._user = user