From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 14 Oct 2012 19:25:40 +0000 (-0700)
Subject: Revert "repoman: identical Manifest commit message"
X-Git-Tag: v2.2.0_alpha138~11
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8651a9e838e4028e74e115f26e263639c1835173;p=portage.git

Revert "repoman: identical Manifest commit message"

This reverts commit b91eefc82e995ba3463d212f95fa9228c5cf53ae.
See bug #437546, comment #3.
---

diff --git a/bin/repoman b/bin/repoman
index 8dd85d011..ecf1bd251 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -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 = []