mirror of
https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu
synced 2025-03-08 17:51:11 +00:00
Fix some brown paper bag bugs in the hint parsing code.
Signed-off-by: Adam D. Barratt <adam@adam-barratt.org.uk>
This commit is contained in:
parent
ef2fc7750f
commit
76a83ae527
@ -796,7 +796,7 @@ class Britney:
|
|||||||
continue
|
continue
|
||||||
elif l[0] in ["approve", "block", "block-all", "block-udeb", "unblock", "unblock-udeb", "force", "urgent", "remove"]:
|
elif l[0] in ["approve", "block", "block-all", "block-udeb", "unblock", "unblock-udeb", "force", "urgent", "remove"]:
|
||||||
for package in l[1:]:
|
for package in l[1:]:
|
||||||
hints.add_hint('%s %s"' % (l[0], package), who)
|
hints.add_hint('%s %s' % (l[0], package), who)
|
||||||
elif l[0] in ["age-days"]:
|
elif l[0] in ["age-days"]:
|
||||||
for package in l[2:]:
|
for package in l[2:]:
|
||||||
hints.add_hint('%s %s %s' % (l[0], l[1], package), who)
|
hints.add_hint('%s %s %s' % (l[0], l[1], package), who)
|
||||||
@ -1590,7 +1590,7 @@ class Britney:
|
|||||||
upgrade_me.append("-%s" % (src))
|
upgrade_me.append("-%s" % (src))
|
||||||
excuse = Excuse("-%s" % (src))
|
excuse = Excuse("-%s" % (src))
|
||||||
excuse.set_vers(tsrcv, None)
|
excuse.set_vers(tsrcv, None)
|
||||||
excuse.addhtml("Removal request by %s" % (item.packages[0].user))
|
excuse.addhtml("Removal request by %s" % (item.user))
|
||||||
excuse.addhtml("Package is broken, will try to remove")
|
excuse.addhtml("Package is broken, will try to remove")
|
||||||
self.excuses.append(excuse)
|
self.excuses.append(excuse)
|
||||||
|
|
||||||
|
7
hints.py
7
hints.py
@ -54,6 +54,9 @@ class Hint:
|
|||||||
else:
|
else:
|
||||||
self._days, self._packages = self._packages.split(' ', 1)
|
self._days, self._packages = self._packages.split(' ', 1)
|
||||||
|
|
||||||
|
if isinstance(self._packages, str):
|
||||||
|
self._packages = self._packages.split(' ')
|
||||||
|
|
||||||
self._packages = [HintItem(x) for x in self._packages]
|
self._packages = [HintItem(x) for x in self._packages]
|
||||||
|
|
||||||
def set_active(self, active):
|
def set_active(self, active):
|
||||||
@ -77,3 +80,7 @@ class Hint:
|
|||||||
@property
|
@property
|
||||||
def user(self):
|
def user(self):
|
||||||
return self._user
|
return self._user
|
||||||
|
|
||||||
|
@property
|
||||||
|
def days(self):
|
||||||
|
return self._days
|
||||||
|
Loading…
x
Reference in New Issue
Block a user