summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Ryabitsev <konstantin@linuxfoundation.org>2021-06-03 10:27:49 -0400
committerKonstantin Ryabitsev <konstantin@linuxfoundation.org>2021-06-03 10:27:49 -0400
commit814f8fa85b67dc971cf86a18929a892d5e954a32 (patch)
tree0837123c4558b62bc71ae67bf409586f8ee1a51e
parent9e20f8a50372d3b4497141c2c102df7b0f00de01 (diff)
downloadb4-814f8fa85b67dc971cf86a18929a892d5e954a32.tar.gz
Fix partial reroll TUI visuals for v1->v2
Before: ✓ [PATCH v2 1/8] selftests/x86: Test signal frame XSTATE header corruption handling ✓ [PATCH v2 2/8] x86/fpu: Prevent state corruption in __fpu__restore_sig() ✓ [PATCH 3/8] x86/fpu: Invalidate FPU state after a failed XRSTOR from a user buffer ✓ [PATCH 4/8] x86/fpu: Limit xstate copy size in xstateregs_set() ✓ [PATCH v2 5/8] x86/fpu: Sanitize xstateregs_set() ✓ [PATCH 6/8] x86/fpu: Add address range checks to copy_user_to_xstate() ✓ [PATCH 7/8] x86/fpu: Clean up the fpu__clear() variants ✓ [PATCH 8/8] x86/fpu: Deduplicate copy_xxx_to_xstate() After: ✓ [PATCH v2 1/8] selftests/x86: Test signal frame XSTATE header corruption handling ✓ [PATCH v2 2/8] x86/fpu: Prevent state corruption in __fpu__restore_sig() ✓ [PATCH v1->v2 3/8] x86/fpu: Invalidate FPU state after a failed XRSTOR from a user buffer ✓ [PATCH v1->v2 4/8] x86/fpu: Limit xstate copy size in xstateregs_set() ✓ [PATCH v2 5/8] x86/fpu: Sanitize xstateregs_set() ✓ [PATCH v1->v2 6/8] x86/fpu: Add address range checks to copy_user_to_xstate() ✓ [PATCH v1->v2 7/8] x86/fpu: Clean up the fpu__clear() variants ✓ [PATCH v1->v2 8/8] x86/fpu: Deduplicate copy_xxx_to_xstate() Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
-rw-r--r--b4/__init__.py13
1 files changed, 6 insertions, 7 deletions
diff --git a/b4/__init__.py b/b4/__init__.py
index 41100ad..c1f77e8 100644
--- a/b4/__init__.py
+++ b/b4/__init__.py
@@ -1505,14 +1505,13 @@ class LoreMessage:
parts = ['PATCH']
if self.lsubject.rfc:
parts.append('RFC')
- if not self.revision_inferred:
- if self.reroll_from_revision:
- if self.reroll_from_revision != self.revision:
- parts.append('v%d->v%d' % (self.reroll_from_revision, self.revision))
- else:
- parts.append(' %s v%d' % (' ' * len(str(self.reroll_from_revision)), self.revision))
+ if self.reroll_from_revision:
+ if self.reroll_from_revision != self.revision:
+ parts.append('v%d->v%d' % (self.reroll_from_revision, self.revision))
else:
- parts.append('v%d' % self.revision)
+ parts.append(' %s v%d' % (' ' * len(str(self.reroll_from_revision)), self.revision))
+ elif not self.revision_inferred:
+ parts.append('v%d' % self.revision)
if not self.lsubject.counters_inferred:
parts.append('%d/%d' % (self.lsubject.counter, self.lsubject.expected))