| 1 |
commit: 6f526bf9532b34434f2f5a6860901941ee86382c |
| 2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Gentoo <DOT> Org> |
| 3 |
AuthorDate: Wed Mar 30 22:19:54 2011 +0000 |
| 4 |
Commit: Arfrever Frehtes Taifersar Arahesis <arfrever <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Mar 30 22:19:54 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=6f526bf9 |
| 7 |
|
| 8 |
Minor improvements in gpgsign(). |
| 9 |
repoman_settings["PORTAGE_GPG_DIR"] is always set. |
| 10 |
|
| 11 |
--- |
| 12 |
bin/repoman | 9 ++++----- |
| 13 |
1 files changed, 4 insertions(+), 5 deletions(-) |
| 14 |
|
| 15 |
diff --git a/bin/repoman b/bin/repoman |
| 16 |
index 985b8ea..8f36372 100755 |
| 17 |
--- a/bin/repoman |
| 18 |
+++ b/bin/repoman |
| 19 |
@@ -2423,16 +2423,15 @@ else: |
| 20 |
raise portage.exception.MissingParameter("PORTAGE_GPG_KEY is unset!") |
| 21 |
if "PORTAGE_GPG_DIR" not in repoman_settings: |
| 22 |
repoman_settings["PORTAGE_GPG_DIR"] = os.path.expanduser("~/.gnupg") |
| 23 |
- logging.info("Automatically setting PORTAGE_GPG_DIR to %s" % repoman_settings["PORTAGE_GPG_DIR"]) |
| 24 |
+ logging.info("Automatically setting PORTAGE_GPG_DIR to '%s'" % repoman_settings["PORTAGE_GPG_DIR"]) |
| 25 |
repoman_settings["PORTAGE_GPG_DIR"] = os.path.expanduser(repoman_settings["PORTAGE_GPG_DIR"]) |
| 26 |
if not os.access(repoman_settings["PORTAGE_GPG_DIR"], os.X_OK): |
| 27 |
raise portage.exception.InvalidLocation( |
| 28 |
"Unable to access directory: PORTAGE_GPG_DIR='%s'" % \ |
| 29 |
repoman_settings["PORTAGE_GPG_DIR"]) |
| 30 |
- gpgcmd = "gpg --sign --clearsign --yes " |
| 31 |
- gpgcmd+= "--default-key "+repoman_settings["PORTAGE_GPG_KEY"] |
| 32 |
- if "PORTAGE_GPG_DIR" in repoman_settings: |
| 33 |
- gpgcmd += " --homedir "+repoman_settings["PORTAGE_GPG_DIR"] |
| 34 |
+ gpgcmd = "gpg --sign --clearsign --yes" |
| 35 |
+ gpgcmd += " --default-key " + repoman_settings["PORTAGE_GPG_KEY"] |
| 36 |
+ gpgcmd += " --homedir " + repoman_settings["PORTAGE_GPG_DIR"] |
| 37 |
if options.pretend: |
| 38 |
print("("+gpgcmd+" "+filename+")") |
| 39 |
else: |
Archives