Revert "repoman: identical Manifest commit message"
authorZac Medico <zmedico@gentoo.org>
Sun, 14 Oct 2012 19:25:40 +0000 (12:25 -0700)
committerZac Medico <zmedico@gentoo.org>
Sun, 14 Oct 2012 19:25:40 +0000 (12:25 -0700)
This reverts commit b91eefc82e995ba3463d212f95fa9228c5cf53ae.
See bug #437546, comment #3.

bin/repoman

index 8dd85d011e8ee87481bb2166b102a70a7e5de39c..ecf1bd251c4d25e1bcba4576bfbe9bb203d36f88 100755 (executable)
@@ -2859,7 +2859,14 @@ else:
 
                fd, commitmessagefile = tempfile.mkstemp(".repoman.msg")
                mymsg = os.fdopen(fd, "wb")
-               mymsg.write(_unicode_encode(commitmessage))
+               # strip the closing parenthesis
+               mymsg.write(_unicode_encode(commitmessage[:-1]))
+               if signed:
+                       mymsg.write(_unicode_encode(
+                               ", signed Manifest commit with key %s)" % \
+                               repoman_settings["PORTAGE_GPG_KEY"]))
+               else:
+                       mymsg.write(b", unsigned Manifest commit)")
                mymsg.close()
 
                commit_cmd = []