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 1Q9utB-0002eA-6M for garchives@archives.gentoo.org; Wed, 13 Apr 2011 07:53:25 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4C3761C05D; 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 174951C05D 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 8E9C31B4116 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 9332D80072 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: <439baf280a7b927ce190c5f6fdc698731db37dfb.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: 439baf280a7b927ce190c5f6fdc698731db37dfb 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: 1c8a6523cd06b590a5745cc93346b6f1 commit: 439baf280a7b927ce190c5f6fdc698731db37dfb Author: Arfrever Frehtes Taifersar Arahesis Gentoo Org> AuthorDate: Wed Mar 30 20:32:45 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Apr 13 07:40:39 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D439baf28 Simplify calculation of repoman_settings["PORTAGE_GPG_DIR"] in gpgsign(). os.path.expanduser() works even when HOME environment variable is not set= . --- bin/repoman | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/bin/repoman b/bin/repoman index 86eba81..0a480a5 100755 --- a/bin/repoman +++ b/bin/repoman @@ -2421,11 +2421,8 @@ else: if "PORTAGE_GPG_KEY" not in repoman_settings: raise portage.exception.MissingParameter("PORTAGE_GPG_KEY is unset!") if "PORTAGE_GPG_DIR" not in repoman_settings: - if "HOME" in os.environ: - repoman_settings["PORTAGE_GPG_DIR"] =3D os.path.join(os.environ["HOM= E"], ".gnupg") - logging.info("Automatically setting PORTAGE_GPG_DIR to %s" % repoman= _settings["PORTAGE_GPG_DIR"]) - else: - raise portage.exception.MissingParameter("PORTAGE_GPG_DIR is unset!"= ) + repoman_settings["PORTAGE_GPG_DIR"] =3D os.path.expanduser("~/.gnupg"= ) + logging.info("Automatically setting PORTAGE_GPG_DIR to %s" % repoman_= 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(