Bug#899085: release.debian.org: excuses terminology: replace "Valid Candidate" with "Trying to migrate"?
Control: tags -1 patch
Paul Wise:
> On Mon, May 21, 2018 at 2:46 PM, Niels Thykier wrote:
>
>> When I wrote the messages, I wanted to quickly high light the three
>> basic states ("OK", "WAITING" or "BLOCKED"/rejected). The first two
>> states implies that the contributor does not need to do anything at the
>> moment, where as the latter implies that the some human intervention is
>> needed.
>
> The messages for the WAITING states already start with Waiting.
>
> The messages for the OK states indicate what is going to happen.
>
> So, I'd say the states aren't needed in those messages but if you
> prefer to keep them, that is fine too.
>
> The messages for the BLOCKED states probably do need the state though.
>
> I don't think you need the "please see below" style messages since
> excuses are usually always presented all at once?
>
Based on your comments, I have made a branch on salsa:
https://salsa.debian.org/release-team/britney2/tree/bug-899085-excuse-messages
The patches are also attached (assuming it is easier for you to review
them by email).
Thanks,
~Niels
From 5dd4a5141c9ecedd0c0a09386725ceb839559f5a Mon Sep 17 00:00:00 2001
From: Niels Thykier <niels@thykier.net>
Date: Mon, 21 May 2018 07:48:10 +0000
Subject: [PATCH 1/2] Avoid explicit state in non-actionable excuses
Signed-off-by: Niels Thykier <niels@thykier.net>
---
britney2/excuse.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/britney2/excuse.py b/britney2/excuse.py
index cd1e46d..dc109bf 100644
--- a/britney2/excuse.py
+++ b/britney2/excuse.py
@@ -21,13 +21,13 @@ from britney2.policies.policy import PolicyVerdict
VERDICT2DESC = {
PolicyVerdict.PASS:
- 'OK: Will attempt migration (Any information below is purely informational)',
+ 'Will attempt migration (Any information below is purely informational)',
PolicyVerdict.PASS_HINTED:
- 'OK: Will attempt migration due to a hint (Any information below is purely informational)',
+ 'Will attempt migration due to a hint (Any information below is purely informational)',
PolicyVerdict.REJECTED_TEMPORARILY:
- 'WAITING: Waiting for test results, another package or too young (no action required now - check later)',
+ 'Waiting for test results, another package or too young (no action required now - check later)',
PolicyVerdict.REJECTED_WAITING_FOR_ANOTHER_ITEM:
- 'WAITING: Waiting for another item to be ready to migrate (no action required now - check later)',
+ 'Waiting for another item to be ready to migrate (no action required now - check later)',
PolicyVerdict.REJECTED_BLOCKED_BY_ANOTHER_ITEM:
'BLOCKED: Cannot migrate due to another item, which is blocked (please check which dependencies are stuck)',
PolicyVerdict.REJECTED_NEEDS_APPROVAL:
@@ -35,7 +35,7 @@ VERDICT2DESC = {
PolicyVerdict.REJECTED_CANNOT_DETERMINE_IF_PERMANENT:
'BLOCKED: Maybe temporary, maybe blocked but Britney is missing information (check below or the buildds)',
PolicyVerdict.REJECTED_PERMANENTLY:
- 'BLOCKED: Rejected/introduces a regression (please see below)'
+ 'BLOCKED: Rejected/introduces a regression',
}
--
2.17.0
From d11152b36601bf81c2ab0f24a476654bb1e59eff Mon Sep 17 00:00:00 2001
From: Niels Thykier <niels@thykier.net>
Date: Mon, 21 May 2018 07:48:33 +0000
Subject: [PATCH 2/2] Remove the "valid candidate"/"Not considered" messages
Signed-off-by: Niels Thykier <niels@thykier.net>
---
britney2/excuse.py | 4 ----
1 file changed, 4 deletions(-)
diff --git a/britney2/excuse.py b/britney2/excuse.py
index dc109bf..5a2b48a 100644
--- a/britney2/excuse.py
+++ b/britney2/excuse.py
@@ -240,10 +240,6 @@ class Excuse(object):
else:
res = res + "<li>Build-Depends(-Arch): %s <a href=\"#%s\">%s</a>\n" % (self.name, dep, dep)
- if self.is_valid:
- res += "<li>Valid candidate\n"
- else:
- res += "<li>Not considered\n"
res = res + "</ul>\n"
return res
--
2.17.0
Reply to: