| 1 |
commit: bcedb21fea9c6b2ba67f3bc49cf1093260f9138d |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jun 25 19:48:09 2019 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jun 25 20:06:07 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=bcedb21f |
| 7 |
|
| 8 |
SyncBase: fix keyserver None message (bug 688648) |
| 9 |
|
| 10 |
Fixes: 244a4021ce58 ("repos.conf: add sync-openpgp-keyserver option (bug 680908)") |
| 11 |
Bug: https://bugs.gentoo.org/688648 |
| 12 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
| 13 |
|
| 14 |
lib/portage/sync/syncbase.py | 3 ++- |
| 15 |
1 file changed, 2 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/lib/portage/sync/syncbase.py b/lib/portage/sync/syncbase.py |
| 18 |
index ae9ec938e..d15bb6d14 100644 |
| 19 |
--- a/lib/portage/sync/syncbase.py |
| 20 |
+++ b/lib/portage/sync/syncbase.py |
| 21 |
@@ -252,7 +252,8 @@ class SyncBase(object): |
| 22 |
@type openpgp_env: gemato.openpgp.OpenPGPEnvironment |
| 23 |
""" |
| 24 |
out = portage.output.EOutput(quiet=('--quiet' in self.options['emerge_config'].opts)) |
| 25 |
- out.ebegin('Refreshing keys from keyserver {s}'.format(s=self.repo.sync_openpgp_keyserver)) |
| 26 |
+ out.ebegin('Refreshing keys from keyserver{}'.format( |
| 27 |
+ ('' if self.repo.sync_openpgp_keyserver is None else ' ' + self.repo.sync_openpgp_keyserver))) |
| 28 |
retry_decorator = self._key_refresh_retry_decorator() |
| 29 |
if retry_decorator is None: |
| 30 |
openpgp_env.refresh_keys(keyserver=self.repo.sync_openpgp_keyserver) |
Archives