diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2019-06-25 12:48:09 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2019-06-25 13:06:07 -0700 |
| commit | bcedb21fea9c6b2ba67f3bc49cf1093260f9138d (patch) | |
| tree | 8a216550f0a4b5ad0ae3872db24e187978308b5d | |
| parent | repoman: Update for a repoman-2.3.16 release (diff) | |
| download | gentoo-portage-bcedb21fea9c6b2ba67f3bc49cf1093260f9138d.tar.xz gentoo-portage-bcedb21fea9c6b2ba67f3bc49cf1093260f9138d.zip | |
SyncBase: fix keyserver None message (bug 688648)
Fixes: 244a4021ce58 ("repos.conf: add sync-openpgp-keyserver option (bug 680908)")
Bug: https://bugs.gentoo.org/688648
Signed-off-by: Zac Medico <zmedico@gentoo.org>
| -rw-r--r-- | lib/portage/sync/syncbase.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/portage/sync/syncbase.py b/lib/portage/sync/syncbase.py index ae9ec938e..d15bb6d14 100644 --- a/lib/portage/sync/syncbase.py +++ b/lib/portage/sync/syncbase.py @@ -252,7 +252,8 @@ class SyncBase(object): @type openpgp_env: gemato.openpgp.OpenPGPEnvironment """ out = portage.output.EOutput(quiet=('--quiet' in self.options['emerge_config'].opts)) - out.ebegin('Refreshing keys from keyserver {s}'.format(s=self.repo.sync_openpgp_keyserver)) + out.ebegin('Refreshing keys from keyserver{}'.format( + ('' if self.repo.sync_openpgp_keyserver is None else ' ' + self.repo.sync_openpgp_keyserver))) retry_decorator = self._key_refresh_retry_decorator() if retry_decorator is None: openpgp_env.refresh_keys(keyserver=self.repo.sync_openpgp_keyserver) |