From 8fb4d5d841953ecbf64f644bec46d5096050f48e Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Tue, 4 Aug 2020 09:34:43 +0100 Subject: [PATCH] BlockPolicy, ExcuseFinder: refer to DISTRO-release On Ubuntu we want this to say ubuntu-release, on Debian debian-release. Substitute the first part with the name of the distro. --- britney2/excusefinder.py | 6 ++++-- britney2/policies/policy.py | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/britney2/excusefinder.py b/britney2/excusefinder.py index 7371a89..20044b1 100644 --- a/britney2/excusefinder.py +++ b/britney2/excusefinder.py @@ -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 diff --git a/britney2/policies/policy.py b/britney2/policies/policy.py index 56d98ad..226ff50 100644 --- a/britney2/policies/policy.py +++ b/britney2/policies/policy.py @@ -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"