[gentoo-commits] proj/portage:master commit in: lib/portage/sync/

[Zac Medico]

commit:     bcedb21fea9c6b2ba67f3bc49cf1093260f9138d
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 25 19:48:09 2019 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Jun 25 20:06:07 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=bcedb21f

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 <AT> gentoo.org>

 lib/portage/sync/syncbase.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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)