diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-08-06 15:38:21 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-06 15:54:05 -0700 |
| commit | d306ffaab50cc43a287a57bb96cd40a7efbf4f95 (patch) | |
| tree | dc22496e7bba57ec42be0f4394ff12b53648aa49 /pym/_emerge/depgraph.py | |
| parent | 233dd1cad9ce4886210bd4183047f319bbfd12da (diff) | |
| download | portage-d306ffaab50cc43a287a57bb96cd40a7efbf4f95.tar.gz portage-d306ffaab50cc43a287a57bb96cd40a7efbf4f95.tar.bz2 portage-d306ffaab50cc43a287a57bb96cd40a7efbf4f95.zip | |
Make dep_check use depgraph._pkg_use_enabled to query USE settings of new-style virtuals when appropriate.
Diffstat (limited to 'pym/_emerge/depgraph.py')
| -rw-r--r-- | pym/_emerge/depgraph.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 82388bb42..d765055ba 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -2141,12 +2141,14 @@ class depgraph(object): pkgsettings = self._frozen_config.pkgsettings[root] if trees is None: trees = self._dynamic_config._filtered_trees + mytrees = trees[root] atom_graph = digraph() if True: # Temporarily disable autounmask so that || preferences # account for masking and USE settings. _autounmask_backup = self._dynamic_config._autounmask self._dynamic_config._autounmask = False + mytrees["pkg_use_enabled"] = self._pkg_use_enabled try: if parent is not None: trees[root]["parent"] = parent @@ -2160,6 +2162,7 @@ class depgraph(object): myroot=root, trees=trees) finally: self._dynamic_config._autounmask = _autounmask_backup + del mytrees["pkg_use_enabled"] if parent is not None: trees[root].pop("parent") trees[root].pop("atom_graph") |