diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-11-04 00:21:02 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-11-04 00:21:02 +0000 |
| commit | 62b34e352a96e86e103dd88de82a908512ede010 (patch) | |
| tree | c306b13219bd1b82374b9f16afed0c3eb8bdfa12 /pym | |
| parent | 79c8f649ff319f22479a3378bdf9566ccc5b0128 (diff) | |
| download | portage-62b34e352a96e86e103dd88de82a908512ede010.tar.gz portage-62b34e352a96e86e103dd88de82a908512ede010.tar.bz2 portage-62b34e352a96e86e103dd88de82a908512ede010.zip | |
For sanity, pass an actual list of keys into aux_get() instead
of iterating over a set that happens to be mutable (though it
remains constant in practice).
svn path=/main/trunk/; revision=8410
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/dbapi/porttree.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py index e6238700d..ea51f5d7e 100644 --- a/pym/portage/dbapi/porttree.py +++ b/pym/portage/dbapi/porttree.py @@ -604,14 +604,15 @@ class portdbapi(dbapi): myval = "" settings = self.mysettings local_config = settings.local_config + aux_keys = list(self._aux_cache_keys) if level == "minimum-visible": iterfunc = iter else: iterfunc = reversed for cpv in iterfunc(mylist): try: - metadata = dict(izip(self._aux_cache_keys, - self.aux_get(cpv, self._aux_cache_keys))) + metadata = dict(izip(aux_keys, + self.aux_get(cpv, aux_keys))) except KeyError: # ebuild masked by corruption continue @@ -709,7 +710,7 @@ class portdbapi(dbapi): if mylist is None: return [] newlist=[] - aux_keys = self._aux_cache_keys + aux_keys = list(self._aux_cache_keys) metadata = {} local_config = self.mysettings.local_config for mycpv in mylist: |