commit: 528dc7cfa2856c1467759e81c99e35322fbffcce
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Tue Dec 1 17:54:17 2015 +0000
Commit: Arfrever Frehtes Taifersar Arahesis <arfrever <AT> apache <DOT> org>
CommitDate: Tue Dec 1 17:54:17 2015 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=528dc7cf
portage.package.ebuild.fetch.fetch(): Clean setting of variables.
pym/portage/package/ebuild/fetch.py | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/pym/portage/package/ebuild/fetch.py
b/pym/portage/package/ebuild/fetch.py
index 7e4e6fe..1be2800 100644
--- a/pym/portage/package/ebuild/fetch.py
+++ b/pym/portage/package/ebuild/fetch.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2014 Gentoo Foundation
+# Copyright 2010-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
from __future__ import print_function
@@ -987,10 +987,9 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0,
}
for k in ("DISTDIR",
"PORTAGE_SSH_OPTS"):
- try:
- variables[k] =
mysettings[k]
- except KeyError:
- pass
+ v = mysettings.get(k)
+ if v is not None:
+ variables[k] = v
myfetch = shlex_split(locfetch)
myfetch = [varexpand(x,
mydict=variables) for x in myfetch]
