From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Q9usN-0002UC-2g for garchives@archives.gentoo.org; Wed, 13 Apr 2011 07:52:35 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4E13F1C061; Wed, 13 Apr 2011 07:52:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 15C781C044 for ; Wed, 13 Apr 2011 07:52:13 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 93F701B411C for ; Wed, 13 Apr 2011 07:52:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id D9D7680074 for ; Wed, 13 Apr 2011 07:52:11 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <2ab0fa496c6f923503744f7492e611ead8ce2682.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:2.1.9 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: 2ab0fa496c6f923503744f7492e611ead8ce2682 Date: Wed, 13 Apr 2011 07:52:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: c29d4a45e1c3438a979e69acdd81e0a0 commit: 2ab0fa496c6f923503744f7492e611ead8ce2682 Author: Arfrever Frehtes Taifersar Arahesis Gentoo Org> AuthorDate: Wed Mar 30 22:19:54 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Apr 13 07:40:48 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D2ab0fa49 Minor improvements in gpgsign(). repoman_settings["PORTAGE_GPG_DIR"] is always set. --- bin/repoman | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/bin/repoman b/bin/repoman index 0a480a5..7236909 100755 --- a/bin/repoman +++ b/bin/repoman @@ -2422,16 +2422,15 @@ else: raise portage.exception.MissingParameter("PORTAGE_GPG_KEY is unset!") if "PORTAGE_GPG_DIR" not in repoman_settings: repoman_settings["PORTAGE_GPG_DIR"] =3D os.path.expanduser("~/.gnupg"= ) - logging.info("Automatically setting PORTAGE_GPG_DIR to %s" % repoman_= settings["PORTAGE_GPG_DIR"]) + logging.info("Automatically setting PORTAGE_GPG_DIR to '%s'" % repoma= n_settings["PORTAGE_GPG_DIR"]) repoman_settings["PORTAGE_GPG_DIR"] =3D os.path.expanduser(repoman_set= tings["PORTAGE_GPG_DIR"]) if not os.access(repoman_settings["PORTAGE_GPG_DIR"], os.X_OK): raise portage.exception.InvalidLocation( "Unable to access directory: PORTAGE_GPG_DIR=3D'%s'" % \ repoman_settings["PORTAGE_GPG_DIR"]) - gpgcmd =3D "gpg --sign --clearsign --yes " - gpgcmd+=3D "--default-key "+repoman_settings["PORTAGE_GPG_KEY"] - if "PORTAGE_GPG_DIR" in repoman_settings: - gpgcmd +=3D " --homedir "+repoman_settings["PORTAGE_GPG_DIR"] + gpgcmd =3D "gpg --sign --clearsign --yes" + gpgcmd +=3D " --default-key " + repoman_settings["PORTAGE_GPG_KEY"] + gpgcmd +=3D " --homedir " + repoman_settings["PORTAGE_GPG_DIR"] if options.pretend: print("("+gpgcmd+" "+filename+")") else: