diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-04-20 23:38:17 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-04-20 23:45:31 -0700 |
| commit | d603f1440c814377fbc1965729fd9b6b008cf76d (patch) | |
| tree | 83ba90cc2bb3a37768cc6263fd8db5d39b5b7e4a /pym/_emerge/depgraph.py | |
| parent | 92a8357ca98d4a42e7747abd2cf4b390381fc6bc (diff) | |
| download | portage-d603f1440c814377fbc1965729fd9b6b008cf76d.tar.gz portage-d603f1440c814377fbc1965729fd9b6b008cf76d.tar.bz2 portage-d603f1440c814377fbc1965729fd9b6b008cf76d.zip | |
dbapi: account for unevaluated_atom in caches
This will fix bug 412391. This is analogous to the bug fixed in
commit 5438bb29c996d777b6343515995176912a7c137f.
Diffstat (limited to 'pym/_emerge/depgraph.py')
| -rw-r--r-- | pym/_emerge/depgraph.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index e77c0e82f..e6245598f 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -6753,7 +6753,8 @@ class _dep_check_composite_db(dbapi): return ret def match(self, atom): - ret = self._match_cache.get(atom) + cache_key = (atom, atom.unevaluated_atom) + ret = self._match_cache.get(cache_key) if ret is not None: return ret[:] @@ -6801,7 +6802,7 @@ class _dep_check_composite_db(dbapi): if len(ret) > 1: self._cpv_sort_ascending(ret) - self._match_cache[atom] = ret + self._match_cache[cache_key] = ret return ret[:] def _visible(self, pkg): |