Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/
Date: Fri, 18 Nov 2011 05:16:12
Message-Id: fcb918d19bfd96dbafcacb67d54977aa9e471013.zmedico@gentoo
1 commit: fcb918d19bfd96dbafcacb67d54977aa9e471013
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Fri Nov 18 05:15:53 2011 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Fri Nov 18 05:15:53 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=fcb918d1
7
8 config: tweak mapping implementation more
9
10 ---
11 pym/portage/package/ebuild/config.py | 6 ++++--
12 1 files changed, 4 insertions(+), 2 deletions(-)
13
14 diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
15 index b722a21..835cd23 100644
16 --- a/pym/portage/package/ebuild/config.py
17 +++ b/pym/portage/package/ebuild/config.py
18 @@ -2094,8 +2094,10 @@ class config(object):
19 return portage._pym_path
20
21 for d in self.lookuplist:
22 - if mykey in d:
23 + try:
24 return d[mykey]
25 + except KeyError:
26 + pass
27
28 raise KeyError(mykey)
29
30 @@ -2153,7 +2155,7 @@ class config(object):
31
32 def iteritems(self):
33 for k in self:
34 - yield (k, self[k])
35 + yield (k, self._getitem(k))
36
37 def items(self):
38 return list(self.iteritems())