[gentoo-commits] proj/portage:master commit in: pym/_emerge/

[Zac Medico]

commit:     1cf4d1e8381a44d9628feb7e3892b4ef70390ce8
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 22 16:03:38 2016 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 16:03:47 2016 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=1cf4d1e8

BinpkgFetcher: suppress PORTAGE_SSH_OPTS KeyError message (bug 572494)

Use the "get" method to avoid triggering a KeyError message.

Fixes: 39d81c514c33 ("[...]config.__getitem__(): Partially drop backward 
compatibility for nonexistent keys.")
X-Gentoo-Bug: 572494
X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=572494

 pym/_emerge/BinpkgFetcher.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pym/_emerge/BinpkgFetcher.py b/pym/_emerge/BinpkgFetcher.py
index 91d24e0..c8fd644 100644
--- a/pym/_emerge/BinpkgFetcher.py
+++ b/pym/_emerge/BinpkgFetcher.py
@@ -84,10 +84,9 @@ class BinpkgFetcher(SpawnProcess):
                }
 
                for k in ("PORTAGE_SSH_OPTS",):
-                       try:
-                               fcmd_vars[k] = settings[k]
-                       except KeyError:
-                               pass
+                       v = settings.get(k)
+                       if v is not None:
+                               fcmd_vars[k] = v
 
                fetch_env = dict(settings.items())
                fetch_args = [portage.util.varexpand(x, mydict=fcmd_vars) \