commit:     13731576aa6e5b118ff8d1e64214982e66b9c5ad
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 30 16:14:59 2018 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Sep 30 20:37:59 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=13731576

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 <AT> gentoo.org>

 repoman/lib/repoman/actions.py | 7 ++++---
 1 file 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
 
 

Reply via email to