Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-03-12 11:51:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

BlockPolicy, ExcuseFinder: refer to DISTRO-release

Browse Source 
On Ubuntu we want this to say ubuntu-release, on Debian debian-release.
Substitute the first part with the name of the distro.
This commit is contained in:
Iain Lane 2020-08-04 09:34:43 +01:00
parent 0dbeb64fde
commit 8fb4d5d841
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
britney2/excusefinder.py
View File

@ -61,7 +61,8 @@ class ExcuseFinder(object):
excuse.add_verdict_info(
excuse.policy_verdict,
"Not touching package, as requested by %s "
"(contact debian-release if update is needed)" % hint.user)
"(contact %s-release if update is needed)" % (hint.user,
self.options.distribution))
excuse.addreason("block")
self.excuses[excuse.name] = excuse
return False
@ -585,7 +586,8 @@ class ExcuseFinder(object):
excuse.add_verdict_info(
excuse.policy_verdict,
"Not removing package, due to block hint by %s "
"(contact debian-release if update is needed)" % blockhint.user)
"(contact %s-release if update is needed)" % (blockhint.user,
self.options.distribution))
excuse.addreason("block")
blocked = True

2
britney2/policies/policy.py
View File

@ -1318,7 +1318,7 @@ class BlockPolicy(BasePolicy):
else:
verdict = PolicyVerdict.REJECTED_NEEDS_APPROVAL
if is_primary or block_cmd == 'block-udeb':
tooltip = "please contact debian-release if update is needed"
tooltip = "please contact %s-release if update is needed" % self._britney.options.distribution
# redirect people to d-i RM for udeb things:
if block_cmd == 'block-udeb':
tooltip = "please contact the d-i release manager if an update is needed"