diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-06-08 10:24:23 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-06-08 10:24:23 -0700 |
| commit | 706dd18b2a2936b0fe6a3bed7e1932eef54f0bd1 (patch) | |
| tree | bf622135d78a175a9375add83219de2e14bfb4d3 /pym/_emerge/resolver | |
| parent | c36d3ea4dec51781f0a1a3f45c3d2565e9ca2f95 (diff) | |
| download | portage-706dd18b2a2936b0fe6a3bed7e1932eef54f0bd1.tar.gz portage-706dd18b2a2936b0fe6a3bed7e1932eef54f0bd1.tar.bz2 portage-706dd18b2a2936b0fe6a3bed7e1932eef54f0bd1.zip | |
extract_affecting_use: _get_useflag_re(eapi)
This is needed for EAPI="4-python" added in commit
586760f37fb9784327d8447182d49810662f4427.
Diffstat (limited to 'pym/_emerge/resolver')
| -rw-r--r-- | pym/_emerge/resolver/circular_dependency.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pym/_emerge/resolver/circular_dependency.py b/pym/_emerge/resolver/circular_dependency.py index e89fd51ed..08dd5c55f 100644 --- a/pym/_emerge/resolver/circular_dependency.py +++ b/pym/_emerge/resolver/circular_dependency.py @@ -112,7 +112,8 @@ class circular_dependency_handler(object): parent_atom = atom.unevaluated_atom break - affecting_use = extract_affecting_use(dep, parent_atom) + affecting_use = extract_affecting_use(dep, parent_atom, + eapi=parent.metadata["EAPI"]) # Make sure we don't want to change a flag that is # a) in use.mask or use.force |