| 1 |
commit: d3d4787ae25dc166f63cfabab97c4b8d70bf67ac |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jun 16 20:27:30 2012 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jun 16 20:27:30 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=d3d4787a |
| 7 |
|
| 8 |
depgraph: simplify _select_pkg_highest_available |
| 9 |
|
| 10 |
This hunk of code is no longer needed since the content of |
| 11 |
_highest_pkg_cache is discarded each time a package is added to the |
| 12 |
graph. |
| 13 |
|
| 14 |
--- |
| 15 |
pym/_emerge/depgraph.py | 8 -------- |
| 16 |
1 files changed, 0 insertions(+), 8 deletions(-) |
| 17 |
|
| 18 |
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
| 19 |
index 83c17ac..276a749 100644 |
| 20 |
--- a/pym/_emerge/depgraph.py |
| 21 |
+++ b/pym/_emerge/depgraph.py |
| 22 |
@@ -3468,14 +3468,6 @@ class depgraph(object): |
| 23 |
cache_key = (root, atom, atom.unevaluated_atom, onlydeps, self._dynamic_config._autounmask) |
| 24 |
ret = self._dynamic_config._highest_pkg_cache.get(cache_key) |
| 25 |
if ret is not None: |
| 26 |
- pkg, existing = ret |
| 27 |
- if pkg and not existing: |
| 28 |
- existing = self._dynamic_config._slot_pkg_map[root].get(pkg.slot_atom) |
| 29 |
- if existing and existing == pkg: |
| 30 |
- # Update the cache to reflect that the |
| 31 |
- # package has been added to the graph. |
| 32 |
- ret = pkg, pkg |
| 33 |
- self._dynamic_config._highest_pkg_cache[cache_key] = ret |
| 34 |
return ret |
| 35 |
ret = self._select_pkg_highest_available_imp(root, atom, onlydeps=onlydeps) |
| 36 |
self._dynamic_config._highest_pkg_cache[cache_key] = ret |
Archives