From: Robin H. Johnson <robbat2@gentoo.org>
Date: Mon, 22 Apr 2013 23:08:50 +0000 (+0000)
Subject: Refactor PORTAGE_GPG_KEY.
X-Git-Tag: v2.2.0_alpha174~16
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=154729f2ede470f454a3f58ef2a26250e28a4e18;p=portage.git

Refactor PORTAGE_GPG_KEY.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
---

diff --git a/bin/repoman b/bin/repoman
index b94863159..c419c6fdc 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -2658,6 +2658,7 @@ else:
 	commitmessage = commitmessage.rstrip()
 	changelog_msg = commitmessage
 	portage_version = getattr(portage, "VERSION", None)
+	gpg_key = repoman_settings.get("PORTAGE_GPG_KEY", "")
 	if portage_version is None:
 		sys.stderr.write("Failed to insert portage version in message!\n")
 		sys.stderr.flush()
@@ -2669,8 +2670,7 @@ else:
 		if options.force:
 			commit_footer += "\nRepoMan-Options: --force"
 		if sign_manifests:
-			commit_footer += "\nManifest-Sign-Key: %s" % \
-				repoman_settings.get("PORTAGE_GPG_KEY", "")
+			commit_footer += "\nManifest-Sign-Key: %s" % (gpg_key, )
 	else:
 		unameout = platform.system() + " "
 		if platform.system() in ["Darwin", "SunOS"]:
@@ -2683,7 +2683,7 @@ else:
 			commit_footer += ", RepoMan options: --force"
 		if sign_manifests:
 			commit_footer += ", signed Manifest commit with key %s" % \
-				repoman_settings.get("PORTAGE_GPG_KEY", "")
+				(gpg_key, )
 		else:
 			commit_footer += ", unsigned Manifest commit"
 		commit_footer += ")"