From eabb5944a6e4f540b3c1a74485e15cd42789ff94 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 6 Aug 2010 22:04:25 -0700 Subject: Ensure that _select_pkg_highest_available_imp() falls back to an installed package if the autounmask path fails to select something. --- pym/_emerge/depgraph.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'pym') diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index c05679561..e0e215cf2 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -2530,6 +2530,8 @@ class depgraph(object): def _select_pkg_highest_available_imp(self, root, atom, onlydeps=False): pkg, existing = self._wrapped_select_pkg_highest_available_imp(root, atom, onlydeps=onlydeps) + default_selection = (pkg, existing) + if self._dynamic_config._autounmask is True: if pkg is not None and \ pkg.installed and \ @@ -2556,6 +2558,11 @@ class depgraph(object): if self._dynamic_config._need_restart: return None, None + if pkg is None: + # This ensures that we can fall back to an installed package + # that may have been rejected in the autounmask path above. + return default_selection + return pkg, existing def _pkg_visibility_check(self, pkg, allow_unstable_keywords=False): -- cgit v1.2.3-1-g7c22