diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2006-04-28 23:22:44 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-04-28 23:22:44 +0000 |
| commit | ab46658189ea0daddc6d9da43f312a3df1db2e09 (patch) | |
| tree | 8b54678d2a23f70209023b0d4e92cee651879268 | |
| parent | Fix spelling of "hierarchy" for bug #131582 and raise an exception for cleane... (diff) | |
| download | portage-ab46658189ea0daddc6d9da43f312a3df1db2e09.tar.gz portage-ab46658189ea0daddc6d9da43f312a3df1db2e09.tar.bz2 portage-ab46658189ea0daddc6d9da43f312a3df1db2e09.zip | |
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
| -rwxr-xr-x | bin/repoman | 4 |
1 files changed, 4 insertions, 0 deletions
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'" % \ |