Use os.path.join for PORTAGE_GPG_DIR and remove a duplicate access check.
authorZac Medico <zmedico@gentoo.org>
Fri, 21 Apr 2006 05:50:21 +0000 (05:50 -0000)
committerZac Medico <zmedico@gentoo.org>
Fri, 21 Apr 2006 05:50:21 +0000 (05:50 -0000)
svn path=/main/trunk/; revision=3181

bin/repoman

index a97611ee0e869f5b290c49b7f5f0944a996f94ea..590973c5097b9efa0a7083a903128c2fb8ca720b 100755 (executable)
@@ -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: