From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 28 Apr 2006 23:22:44 +0000 (-0000)
Subject: Fix PORTAGE_GPG_DIR handling so that ~/.gnupg/ works correctly like the Manifest... 
X-Git-Tag: v2.1_pre10~13
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ab46658189ea0daddc6d9da43f312a3df1db2e09;p=portage.git

Fix PORTAGE_GPG_DIR handling so that ~/.gnupg/ works correctly like the Manifest Signing Guide says it should.  Thanks to Tupone for reporting.

svn path=/main/trunk/; revision=3262
---

diff --git a/bin/repoman b/bin/repoman
index 03bc5ee1f..a6bbd8fa2 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -1582,6 +1582,10 @@ else:
 					print "Automatically setting PORTAGE_GPG_DIR to",repoman_settings["PORTAGE_GPG_DIR"]
 			else:
 				raise portage_exception.MissingParameter("PORTAGE_GPG_DIR is unset!")
+		gpg_dir = repoman_settings["PORTAGE_GPG_DIR"]
+		if gpg_dir.startswith("~") and "HOME" in os.environ:
+			repoman_settings["PORTAGE_GPG_DIR"] = os.path.join(
+				os.environ["HOME"], gpg_dir[1:].lstrip(os.path.sep))
 		if not os.access(repoman_settings["PORTAGE_GPG_DIR"], os.X_OK):
 			raise portage_exception.InvalidLocation(
 				"Unable to access directory: PORTAGE_GPG_DIR='%s'" % \