From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 7 Oct 2012 21:31:39 +0000 (-0700)
Subject: repoman: identical Manifest commit message
X-Git-Tag: v2.2.0_alpha136~14
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b91eefc82e995ba3463d212f95fa9228c5cf53ae;p=portage.git

repoman: identical Manifest commit message

This will fix bug #437546.
---

diff --git a/bin/repoman b/bin/repoman
index 18a3b30ad..ff3f8f765 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -2859,14 +2859,7 @@ else:
 
 		fd, commitmessagefile = tempfile.mkstemp(".repoman.msg")
 		mymsg = os.fdopen(fd, "wb")
-		# 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.write(_unicode_encode(commitmessage))
 		mymsg.close()
 
 		commit_cmd = []