| 1 |
commit: 5c0f68017e9943f9486ee68005ea3ef7743244bd |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 22 22:32:18 2014 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 23 06:14:38 2014 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=5c0f6801 |
| 7 |
|
| 8 |
package_tracker.match: account for unevaluated_atom |
| 9 |
|
| 10 |
This fixes the match cache to properly account for |
| 11 |
atom.unevaluated_atom, which is required since match_from_list output |
| 12 |
depends on atom.unevaluated_atom (for IUSE matching logic). Note that |
| 13 |
similar issues were also fixed in commits |
| 14 |
d603f1440c814377fbc1965729fd9b6b008cf76d and |
| 15 |
5438bb29c996d777b6343515995176912a7c137f. |
| 16 |
|
| 17 |
X-Gentoo-Bug: 515230 |
| 18 |
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=515230 |
| 19 |
|
| 20 |
--- |
| 21 |
pym/_emerge/resolver/package_tracker.py | 2 +- |
| 22 |
1 file changed, 1 insertion(+), 1 deletion(-) |
| 23 |
|
| 24 |
diff --git a/pym/_emerge/resolver/package_tracker.py b/pym/_emerge/resolver/package_tracker.py |
| 25 |
index 5982750..406d5ce 100644 |
| 26 |
--- a/pym/_emerge/resolver/package_tracker.py |
| 27 |
+++ b/pym/_emerge/resolver/package_tracker.py |
| 28 |
@@ -152,7 +152,7 @@ class PackageTracker(object): |
| 29 |
packages may also be returned. |
| 30 |
""" |
| 31 |
cp_key = root, atom.cp |
| 32 |
- cache_key = root, atom, installed |
| 33 |
+ cache_key = root, atom, atom.unevaluated_atom, installed |
| 34 |
try: |
| 35 |
return iter(self._match_cache.get(cp_key, {})[cache_key]) |
| 36 |
except KeyError: |
Archives