| 1 |
commit: 6ba56ad7be84b18dcbf15e8c6b283f5a9a559123 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 12 21:54:22 2015 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 13 16:51:39 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=6ba56ad7 |
| 7 |
|
| 8 |
config.environ: remove redundant check for nonexistent keys |
| 9 |
|
| 10 |
Fixes: 39d81c514c33 ("[...]config.__getitem__(): Partially drop backward compatibility for nonexistent keys.") |
| 11 |
|
| 12 |
pym/portage/package/ebuild/config.py | 5 +---- |
| 13 |
1 file changed, 1 insertion(+), 4 deletions(-) |
| 14 |
|
| 15 |
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py |
| 16 |
index cc431fc..125d979 100644 |
| 17 |
--- a/pym/portage/package/ebuild/config.py |
| 18 |
+++ b/pym/portage/package/ebuild/config.py |
| 19 |
@@ -2712,12 +2712,9 @@ class config(object): |
| 20 |
filter_calling_env = True |
| 21 |
|
| 22 |
environ_whitelist = self._environ_whitelist |
| 23 |
- for x in self: |
| 24 |
+ for x, myvalue in self.iteritems(): |
| 25 |
if x in environ_filter: |
| 26 |
continue |
| 27 |
- myvalue = self.get(x) |
| 28 |
- if myvalue is None: |
| 29 |
- continue |
| 30 |
if not isinstance(myvalue, basestring): |
| 31 |
writemsg(_("!!! Non-string value in config: %s=%s\n") % \ |
| 32 |
(x, myvalue), noiselevel=-1) |
Archives