Make the commitmessage append clearer.
authorMichał Górny <gentoo@mgorny.alt.pl>
Sun, 11 Jul 2010 10:53:20 +0000 (12:53 +0200)
committerZac Medico <zmedico@gentoo.org>
Sun, 11 Jul 2010 18:27:32 +0000 (11:27 -0700)
Put an empty line between the real commit message and Portage version
append. Instead of creating a second pair of parenthesis
for the Manifest commit one, append it to the Portage version.

bin/repoman

index 750bc66640f6ef91803bd7ed7c72c1812f54253d..f14dc453398c2c88a8d8acd71b4e1a444a7e67e3 100755 (executable)
@@ -2270,7 +2270,7 @@ else:
                unameout += platform.processor()
        else:
                unameout += platform.machine()
-       commitmessage += "\n(Portage version: %s/%s/%s" % \
+       commitmessage += "\n\n(Portage version: %s/%s/%s" % \
                (portage_version, vcs, unameout)
        if options.force:
                commitmessage += ", RepoMan options: --force"
@@ -2525,11 +2525,12 @@ else:
 
                fd, commitmessagefile = tempfile.mkstemp(".repoman.msg")
                mymsg = os.fdopen(fd, "w")
-               mymsg.write(commitmessage)
+               # strip the closing parenthesis
+               mymsg.write(commitmessage[:-1])
                if signed:
-                       mymsg.write("\n (Signed Manifest commit)")
+                       mymsg.write(", signed Manifest commit)")
                else:
-                       mymsg.write("\n (Unsigned Manifest commit)")
+                       mymsg.write(", unsigned Manifest commit)")
                mymsg.close()
 
                commit_cmd = []