aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2018-09-30 12:14:59 -0400
committerMike Gilbert <floppym@gentoo.org>2018-09-30 16:37:59 -0400
commit13731576aa6e5b118ff8d1e64214982e66b9c5ad (patch)
treef743817494ed3278b76f1226ec7a0b8da26ac59e
parentrepoman: normalize newline handling in get_commit_footer (diff)
downloadportage-13731576aa6e5b118ff8d1e64214982e66b9c5ad.tar.gz
portage-13731576aa6e5b118ff8d1e64214982e66b9c5ad.tar.bz2
portage-13731576aa6e5b118ff8d1e64214982e66b9c5ad.zip
repoman: move Signed-off-by to the end of the footer
This makes for a cleaner looking message when multiple people add their SOB during a review process. Signed-off-by: Mike Gilbert <floppym@gentoo.org>
-rw-r--r--repoman/lib/repoman/actions.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/repoman/lib/repoman/actions.py b/repoman/lib/repoman/actions.py
index 3cf6f7081..4980f11eb 100644
--- a/repoman/lib/repoman/actions.py
+++ b/repoman/lib/repoman/actions.py
@@ -441,9 +441,6 @@ the whole commit message to abort.
bug = urlunsplit(('https',) + purl[1:])
commit_footer += "\n%s: %s" % (tag, bug)
- if dco_sob:
- commit_footer += "\nSigned-off-by: %s" % (dco_sob, )
-
# Use new footer only for git (see bug #438364).
if self.vcs_settings.vcs in ["git"]:
commit_footer += "\nPackage-Manager: Portage-%s, Repoman-%s" % (
@@ -468,6 +465,10 @@ the whole commit message to abort.
else:
commit_footer += ", unsigned Manifest commit"
commit_footer += ")"
+
+ if dco_sob:
+ commit_footer += "\nSigned-off-by: %s" % (dco_sob, )
+
return commit_footer