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

Remove "Not considered" note from excuses.yaml

Browse Source 
Signed-off-by: Niels Thykier <niels@thykier.net>
This commit is contained in:
Niels Thykier 2016-03-28 06:47:45 +00:00
parent a7e493c64d
commit 1400fa1384
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
britney.py
View File

@ -997,7 +997,6 @@ class Britney(object):
for hint in self.hints.search('block', package=pkg, removal=True): for hint in self.hints.search('block', package=pkg, removal=True):
excuse.addhtml("Not touching package, as requested by %s " excuse.addhtml("Not touching package, as requested by %s "
"(check https://release.debian.org/testing/freeze_policy.html if update is needed)" % hint.user) "(check https://release.debian.org/testing/freeze_policy.html if update is needed)" % hint.user)
excuse.addhtml("Not considered")
excuse.addreason("block") excuse.addreason("block")
self.excuses[excuse.name] = excuse self.excuses[excuse.name] = excuse
return False return False
@ -1035,7 +1034,6 @@ class Britney(object):
for hint in self.hints.search('remove', package=src, version=source_t[VERSION]): for hint in self.hints.search('remove', package=src, version=source_t[VERSION]):
excuse.addhtml("Removal request by %s" % (hint.user)) excuse.addhtml("Removal request by %s" % (hint.user))
excuse.addhtml("Trying to remove package, not update it") excuse.addhtml("Trying to remove package, not update it")
excuse.addhtml("Not considered")
excuse.addreason("remove") excuse.addreason("remove")
self.excuses[excuse.name] = excuse self.excuses[excuse.name] = excuse
return False return False
@ -1152,7 +1150,6 @@ class Britney(object):
return True return True
# else if there is something worth doing (but something wrong, too) this package won't be considered # else if there is something worth doing (but something wrong, too) this package won't be considered
elif anyworthdoing: elif anyworthdoing:
excuse.addhtml("Not considered")
self.excuses[excuse.name] = excuse self.excuses[excuse.name] = excuse
# otherwise, return False # otherwise, return False
@ -1446,10 +1443,6 @@ class Britney(object):
# if the package can be updated, it is a valid candidate # if the package can be updated, it is a valid candidate
if update_candidate: if update_candidate:
excuse.is_valid = True excuse.is_valid = True
# else it won't be considered
else:
# TODO
excuse.addhtml("Not considered")
self.excuses[excuse.name] = excuse self.excuses[excuse.name] = excuse
return update_candidate return update_candidate
@ -1502,7 +1495,6 @@ class Britney(object):
p = valid.index(x) p = valid.index(x)
invalid.append(valid.pop(p)) invalid.append(valid.pop(p))
excuses[x].addhtml("Invalidated by dependency") excuses[x].addhtml("Invalidated by dependency")
excuses[x].addhtml("Not considered")
excuses[x].addreason("depends") excuses[x].addreason("depends")
excuses[x].is_valid = False excuses[x].is_valid = False
i = i + 1 i = i + 1

2
excuse.py
View File

@ -161,6 +161,8 @@ class Excuse(object):
res += "<li>Ignoring %s depends: <a href=\"#%s\">%s</a>\n" % (a, n, n) res += "<li>Ignoring %s depends: <a href=\"#%s\">%s</a>\n" % (a, n, n)
if self.is_valid: if self.is_valid:
res += "<li>Valid candidate\n" res += "<li>Valid candidate\n"
else:
res += "<li>Not considered\n"
res = res + "</ul>\n" res = res + "</ul>\n"
return res return res