From c063a4065dc17aa05ef1a97abd1aee066df977f6 Mon Sep 17 00:00:00 2001 From: Konstantin Ryabitsev Date: Mon, 27 Jun 2022 15:48:21 -0400 Subject: Move Signed-off-by below Link trailer when running with -sl Chain-of-custody order requires that Signed-off-by closes the list of added trailers. Signed-off-by: Konstantin Ryabitsev --- b4/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b4/__init__.py b/b4/__init__.py index 1c24fe9..b03ed83 100644 --- a/b4/__init__.py +++ b/b4/__init__.py @@ -537,11 +537,11 @@ class LoreSeries: if lmsg is not None: if self.has_cover and covertrailers and self.patches[0].followup_trailers: # noqa lmsg.followup_trailers += self.patches[0].followup_trailers # noqa + if addlink: + lmsg.followup_trailers.append(('Link', linkmask % lmsg.msgid, None, None)) if addmysob: lmsg.followup_trailers.append(('Signed-off-by', '%s <%s>' % (usercfg['name'], usercfg['email']), None, None)) - if addlink: - lmsg.followup_trailers.append(('Link', linkmask % lmsg.msgid, None, None)) if attsame and not attcrit: if attmark: -- cgit v1.2.3