Gentoo Archives: gentoo-portage-dev

From: Mike Gilbert <floppym@g.o>
To: gentoo-portage-dev@l.g.o
Subject: [gentoo-portage-dev] [PATCH 2/2] repoman: move Signed-off-by to the end of the footer
Date: Sun, 30 Sep 2018 16:27:20
Message-Id: 20180930162713.6235-2-floppym@gentoo.org
In Reply to: [gentoo-portage-dev] [PATCH 1/2] repoman: normalize newline handling in get_commit_footer by Mike Gilbert
1 This makes for a cleaner looking message when multiple people add their
2 SOB during a review process.
3
4 Signed-off-by: Mike Gilbert <floppym@g.o>
5 ---
6 repoman/lib/repoman/actions.py | 7 ++++---
7 1 file changed, 4 insertions(+), 3 deletions(-)
8
9 diff --git a/repoman/lib/repoman/actions.py b/repoman/lib/repoman/actions.py
10 index 3cf6f7081..4980f11eb 100644
11 --- a/repoman/lib/repoman/actions.py
12 +++ b/repoman/lib/repoman/actions.py
13 @@ -441,9 +441,6 @@ the whole commit message to abort.
14 bug = urlunsplit(('https',) + purl[1:])
15 commit_footer += "\n%s: %s" % (tag, bug)
16
17 - if dco_sob:
18 - commit_footer += "\nSigned-off-by: %s" % (dco_sob, )
19 -
20 # Use new footer only for git (see bug #438364).
21 if self.vcs_settings.vcs in ["git"]:
22 commit_footer += "\nPackage-Manager: Portage-%s, Repoman-%s" % (
23 @@ -468,6 +465,10 @@ the whole commit message to abort.
24 else:
25 commit_footer += ", unsigned Manifest commit"
26 commit_footer += ")"
27 +
28 + if dco_sob:
29 + commit_footer += "\nSigned-off-by: %s" % (dco_sob, )
30 +
31 return commit_footer
32
33
34 --
35 2.19.0

Replies