summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-04-21 05:50:21 +0000
committerZac Medico <zmedico@gentoo.org>2006-04-21 05:50:21 +0000
commit443996ef1ad4cdc8fc48c1be018ebefbf1e4be74 (patch)
tree52a25bddb3bf097824d8ae70caec0e7fb704e307
parent37b94a3fe90923dd5975ebdab8b1c2ac7f5ca3bd (diff)
downloadportage-443996ef1ad4cdc8fc48c1be018ebefbf1e4be74.tar.gz
portage-443996ef1ad4cdc8fc48c1be018ebefbf1e4be74.tar.bz2
portage-443996ef1ad4cdc8fc48c1be018ebefbf1e4be74.zip
Use os.path.join for PORTAGE_GPG_DIR and remove a duplicate access check.
svn path=/main/trunk/; revision=3181
-rwxr-xr-xbin/repoman4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/repoman b/bin/repoman
index a97611ee0..590973c50 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -1574,8 +1574,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 os.environ.has_key("HOME") and os.access(os.environ["HOME"]+"/.gnupg", os.R_OK):
- repoman_settings["PORTAGE_GPG_DIR"] = os.environ["HOME"]+"/.gnupg"
+ if os.environ.has_key("HOME"):
+ repoman_settings["PORTAGE_GPG_DIR"] = os.path.join(os.environ["HOME"], ".gnupg")
if quiet < 1:
print "Automatically setting PORTAGE_GPG_DIR to",repoman_settings["PORTAGE_GPG_DIR"]
else: