From: Zac Medico Date: Wed, 18 May 2011 01:31:15 +0000 (-0700) Subject: depgraph._resolve: use temp set for autounmask X-Git-Tag: v2.2.0_alpha34~8 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6186114119ca8b94a51504bfc551ebe4b5cf1098;p=portage.git depgraph._resolve: use temp set for autounmask --- diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 9fb0ceec8..4824a481d 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -2291,18 +2291,22 @@ class depgraph(object): except self._unknown_internal_error: return False, myfavorites - if set(self._dynamic_config.digraph).intersection( \ + digraph_set = frozenset(self._dynamic_config.digraph) + + if digraph_set.intersection( self._dynamic_config._needed_unstable_keywords) or \ - set(self._dynamic_config.digraph).intersection( \ + digraph_set.intersection( self._dynamic_config._needed_p_mask_changes) or \ - set(self._dynamic_config.digraph).intersection( \ + digraph_set.intersection( self._dynamic_config._needed_use_config_changes) or \ - set(self._dynamic_config.digraph).intersection( \ + digraph_set.intersection( self._dynamic_config._needed_license_changes) : #We failed if the user needs to change the configuration self._dynamic_config._success_without_autounmask = True return False, myfavorites + digraph_set = None + if self._rebuild.trigger_rebuilds(): backtrack_infos = self._dynamic_config._backtrack_infos config = backtrack_infos.setdefault("config", {})