From 154729f2ede470f454a3f58ef2a26250e28a4e18 Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Mon, 22 Apr 2013 23:08:50 +0000 Subject: [PATCH] Refactor PORTAGE_GPG_KEY. Signed-off-by: Robin H. Johnson --- bin/repoman | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 += ")" -- 2.26.2