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

repoman: identical Manifest commit message

Include the signed/unsigned part it the initial commit message,
so that it's identical to the Manifest commit message. See
bug #437546, comment #3.
---

diff --git a/bin/repoman b/bin/repoman
index ecf1bd251..edd764935 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -2533,6 +2533,11 @@ else:
 		(portage_version, vcs, unameout)
 	if options.force:
 		commitmessage += ", RepoMan options: --force"
+	if sign_manifests:
+		commitmessage += ", signed Manifest commit with key %s" % \
+			repoman_settings["PORTAGE_GPG_KEY"]
+	else:
+		commitmessage += ", unsigned Manifest commit"
 	commitmessage += ")"
 
 	if options.echangelog in ('y', 'force'):
@@ -2859,14 +2864,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 = []