Gentoo Archives: gentoo-commits

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