From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B2E3D138200 for ; Tue, 23 Apr 2013 03:20:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 14F08E0909; Tue, 23 Apr 2013 03:20:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9B1FAE0909 for ; Tue, 23 Apr 2013 03:20:55 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B52B133DDFE for ; Tue, 23 Apr 2013 03:20:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 17CE1E408C for ; Tue, 23 Apr 2013 03:20:52 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1366685364.154729f2ede470f454a3f58ef2a26250e28a4e18.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/repoman X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 154729f2ede470f454a3f58ef2a26250e28a4e18 X-VCS-Branch: master Date: Tue, 23 Apr 2013 03:20:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: df2ea61f-6f7b-4fc3-a266-db78a1516162 X-Archives-Hash: c2abb577c1a79601a3338f169c2954ad commit: 154729f2ede470f454a3f58ef2a26250e28a4e18 Author: Robin H. Johnson gentoo org> AuthorDate: Mon Apr 22 23:08:50 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Apr 23 02:49:24 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=154729f2 Refactor PORTAGE_GPG_KEY. Signed-off-by: Robin H. Johnson gentoo.org> --- bin/repoman | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/repoman b/bin/repoman index b948631..c419c6f 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 += ")"