diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-06-16 13:27:30 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-06-16 13:27:30 -0700 |
| commit | d3d4787ae25dc166f63cfabab97c4b8d70bf67ac (patch) | |
| tree | 3cd23c28259f25131a9bc892a080dfb087d3b6ab | |
| parent | 66c41adb5505545fde9654e196fd803c3e6c1c5d (diff) | |
| download | portage-d3d4787ae25dc166f63cfabab97c4b8d70bf67ac.tar.gz portage-d3d4787ae25dc166f63cfabab97c4b8d70bf67ac.tar.bz2 portage-d3d4787ae25dc166f63cfabab97c4b8d70bf67ac.zip | |
depgraph: simplify _select_pkg_highest_available
This hunk of code is no longer needed since the content of
_highest_pkg_cache is discarded each time a package is added to the
graph.
| -rw-r--r-- | pym/_emerge/depgraph.py | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 83c17ace6..276a7495e 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -3468,14 +3468,6 @@ class depgraph(object): cache_key = (root, atom, atom.unevaluated_atom, onlydeps, self._dynamic_config._autounmask) ret = self._dynamic_config._highest_pkg_cache.get(cache_key) if ret is not None: - pkg, existing = ret - if pkg and not existing: - existing = self._dynamic_config._slot_pkg_map[root].get(pkg.slot_atom) - if existing and existing == pkg: - # Update the cache to reflect that the - # package has been added to the graph. - ret = pkg, pkg - self._dynamic_config._highest_pkg_cache[cache_key] = ret return ret ret = self._select_pkg_highest_available_imp(root, atom, onlydeps=onlydeps) self._dynamic_config._highest_pkg_cache[cache_key] = ret |