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 <gentoo-commits+bounces-331626-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1Q527O-000289-SY
for garchives@archives.gentoo.org; Wed, 30 Mar 2011 20:35:55 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 1C69D1C05B;
Wed, 30 Mar 2011 20:35:46 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id DED7A1C05B
for <gentoo-commits@lists.gentoo.org>; Wed, 30 Mar 2011 20:35:45 +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 85D991B4066
for <gentoo-commits@lists.gentoo.org>; Wed, 30 Mar 2011 20:35:45 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id 951CB80065
for <gentoo-commits@lists.gentoo.org>; Wed, 30 Mar 2011 20:35:44 +0000 (UTC)
From: "Arfrever Frehtes Taifersar Arahesis" <arfrever@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Arfrever Frehtes Taifersar Arahesis" <arfrever@gentoo.org>
Message-ID: <54e35da1a38b1e3c94afc36f10edd97b999083db.arfrever@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: arfrever
X-VCS-Committer-Name: Arfrever Frehtes Taifersar Arahesis
X-VCS-Revision: 54e35da1a38b1e3c94afc36f10edd97b999083db
Date: Wed, 30 Mar 2011 20:35:44 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: c5daf0988f9fa4dfc5f07a38bbbde2e7
commit: 54e35da1a38b1e3c94afc36f10edd97b999083db
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Gentoo <DO=
T> Org>
AuthorDate: Wed Mar 30 20:32:45 2011 +0000
Commit: Arfrever Frehtes Taifersar Arahesis <arfrever <AT> gentoo <DO=
T> org>
CommitDate: Wed Mar 30 20:32:45 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a=
=3Dcommit;h=3D54e35da1
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 d48b9d1..985b8ea 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -2422,11 +2422,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(