diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-05-17 18:31:15 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-05-17 18:31:15 -0700 |
| commit | 6186114119ca8b94a51504bfc551ebe4b5cf1098 (patch) | |
| tree | 2e1d8849876ee5336fd77fcd90e4b5b9892e6683 /pym | |
| parent | c746e1246f6977c78b00b068e824e2066e66f0f1 (diff) | |
| download | portage-6186114119ca8b94a51504bfc551ebe4b5cf1098.tar.gz portage-6186114119ca8b94a51504bfc551ebe4b5cf1098.tar.bz2 portage-6186114119ca8b94a51504bfc551ebe4b5cf1098.zip | |
depgraph._resolve: use temp set for autounmask
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/_emerge/depgraph.py | 12 |
1 files changed, 8 insertions, 4 deletions
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", {}) |