diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2016-06-02 08:46:41 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2016-06-02 08:47:49 -0700 |
| commit | 90e142b8fccba0507687b747478c5e060effcb00 (patch) | |
| tree | a02bd067fd0ca39284f5a1102cd1dcb9c3e403ec /pym/portage/dbapi/bintree.py | |
| parent | install-qa-check.d/60openrc: validate bash for openrc-run shebangs (diff) | |
| download | portage-90e142b8fccba0507687b747478c5e060effcb00.tar.gz portage-90e142b8fccba0507687b747478c5e060effcb00.tar.bz2 portage-90e142b8fccba0507687b747478c5e060effcb00.zip | |
binarytree._populate: suppress PORTAGE_SSH_OPTS KeyError (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
Diffstat (limited to 'pym/portage/dbapi/bintree.py')
| -rw-r--r-- | pym/portage/dbapi/bintree.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py index dc18d30ed..f4830597e 100644 --- a/pym/portage/dbapi/bintree.py +++ b/pym/portage/dbapi/bintree.py @@ -905,10 +905,9 @@ class binarytree(object): } for k in ("PORTAGE_SSH_OPTS",): - try: - fcmd_vars[k] = self.settings[k] - except KeyError: - pass + v = self.settings.get(k) + if v is not None: + fcmd_vars[k] = v success = portage.getbinpkg.file_get( fcmd=fcmd, fcmd_vars=fcmd_vars) |