diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-08-27 15:16:50 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-08-27 15:16:50 -0700 |
| commit | 06697b0c3fec6cd5bbdd0a68c93261b2d25781d8 (patch) | |
| tree | 54de64e72c97add3c357be6cfbe296d05116f8e9 /pym/_emerge/resolver | |
| parent | ac843c3df2210566b559dc57c5fb657e20933a58 (diff) | |
| download | portage-06697b0c3fec6cd5bbdd0a68c93261b2d25781d8.tar.gz portage-06697b0c3fec6cd5bbdd0a68c93261b2d25781d8.tar.bz2 portage-06697b0c3fec6cd5bbdd0a68c93261b2d25781d8.zip | |
Pass eapi to check_required_use more.
Diffstat (limited to 'pym/_emerge/resolver')
| -rw-r--r-- | pym/_emerge/resolver/circular_dependency.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pym/_emerge/resolver/circular_dependency.py b/pym/_emerge/resolver/circular_dependency.py index aca81face..1433f418c 100644 --- a/pym/_emerge/resolver/circular_dependency.py +++ b/pym/_emerge/resolver/circular_dependency.py @@ -1,4 +1,4 @@ -# Copyright 2010-2011 Gentoo Foundation +# Copyright 2010-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 from __future__ import print_function @@ -144,7 +144,8 @@ class circular_dependency_handler(object): #If any of the flags we're going to touch is in REQUIRED_USE, add all #other flags in REQUIRED_USE to affecting_use, to not lose any solution. required_use_flags = get_required_use_flags( - parent.metadata.get("REQUIRED_USE", "")) + parent.metadata.get("REQUIRED_USE", ""), + eapi=parent.metadata["EAPI"]) if affecting_use.intersection(required_use_flags): # TODO: Find out exactly which REQUIRED_USE flags are @@ -188,7 +189,9 @@ class circular_dependency_handler(object): #Make sure it doesn't conflict with REQUIRED_USE. required_use = parent.metadata.get("REQUIRED_USE", "") - if check_required_use(required_use, current_use, parent.iuse.is_valid_flag): + if check_required_use(required_use, current_use, + parent.iuse.is_valid_flag, + eapi=parent.metadata["EAPI"]): use = self.depgraph._pkg_use_enabled(parent) solution = set() for flag, state in zip(affecting_use, use_state): |