From 348eaf76f9f97b67b923c8a8f3307d94b07e29c1 Mon Sep 17 00:00:00 2001 From: Konstantin Ryabitsev Date: Thu, 3 Jun 2021 10:27:49 -0400 Subject: Fix partial reroll TUI visuals for v1->v2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- b4/__init__.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/b4/__init__.py b/b4/__init__.py index a382ef9..f0d6e07 100644 --- a/b4/__init__.py +++ b/b4/__init__.py @@ -1458,14 +1458,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)) -- cgit v1.2.3