diff options
| author | Arfrever Frehtes Taifersar Arahesis <Arfrever@Gentoo.Org> | 2011-03-31 00:19:54 +0200 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-04-13 00:40:48 -0700 |
| commit | 2ab0fa496c6f923503744f7492e611ead8ce2682 (patch) | |
| tree | 31f01e2a922704d316b94be967eafe8a044dc80b /bin/repoman | |
| parent | 439baf280a7b927ce190c5f6fdc698731db37dfb (diff) | |
| download | portage-2ab0fa496c6f923503744f7492e611ead8ce2682.tar.gz portage-2ab0fa496c6f923503744f7492e611ead8ce2682.tar.bz2 portage-2ab0fa496c6f923503744f7492e611ead8ce2682.zip | |
Minor improvements in gpgsign().
repoman_settings["PORTAGE_GPG_DIR"] is always set.
Diffstat (limited to 'bin/repoman')
| -rwxr-xr-x | bin/repoman | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/bin/repoman b/bin/repoman index 0a480a5cc..723690991 100755 --- a/bin/repoman +++ b/bin/repoman @@ -2422,16 +2422,15 @@ else: raise portage.exception.MissingParameter("PORTAGE_GPG_KEY is unset!") if "PORTAGE_GPG_DIR" not in repoman_settings: repoman_settings["PORTAGE_GPG_DIR"] = os.path.expanduser("~/.gnupg") - logging.info("Automatically setting PORTAGE_GPG_DIR to %s" % repoman_settings["PORTAGE_GPG_DIR"]) + logging.info("Automatically setting PORTAGE_GPG_DIR to '%s'" % repoman_settings["PORTAGE_GPG_DIR"]) repoman_settings["PORTAGE_GPG_DIR"] = os.path.expanduser(repoman_settings["PORTAGE_GPG_DIR"]) if not os.access(repoman_settings["PORTAGE_GPG_DIR"], os.X_OK): raise portage.exception.InvalidLocation( "Unable to access directory: PORTAGE_GPG_DIR='%s'" % \ repoman_settings["PORTAGE_GPG_DIR"]) - gpgcmd = "gpg --sign --clearsign --yes " - gpgcmd+= "--default-key "+repoman_settings["PORTAGE_GPG_KEY"] - if "PORTAGE_GPG_DIR" in repoman_settings: - gpgcmd += " --homedir "+repoman_settings["PORTAGE_GPG_DIR"] + gpgcmd = "gpg --sign --clearsign --yes" + gpgcmd += " --default-key " + repoman_settings["PORTAGE_GPG_KEY"] + gpgcmd += " --homedir " + repoman_settings["PORTAGE_GPG_DIR"] if options.pretend: print("("+gpgcmd+" "+filename+")") else: |