diff options
Diffstat (limited to 'pym/_emerge/resolver')
| -rw-r--r-- | pym/_emerge/resolver/circular_dependency.py | 6 | ||||
| -rw-r--r-- | pym/_emerge/resolver/output.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pym/_emerge/resolver/circular_dependency.py b/pym/_emerge/resolver/circular_dependency.py index 5192d61e9..76c7b3afb 100644 --- a/pym/_emerge/resolver/circular_dependency.py +++ b/pym/_emerge/resolver/circular_dependency.py @@ -127,7 +127,7 @@ class circular_dependency_handler(object): try: affecting_use = extract_affecting_use(dep, parent_atom, - eapi=parent.metadata["EAPI"]) + eapi=parent.eapi) except InvalidDependString: if not parent.installed: raise @@ -147,7 +147,7 @@ class circular_dependency_handler(object): #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", ""), - eapi=parent.metadata["EAPI"]) + eapi=parent.eapi) if affecting_use.intersection(required_use_flags): # TODO: Find out exactly which REQUIRED_USE flags are @@ -193,7 +193,7 @@ class circular_dependency_handler(object): if check_required_use(required_use, current_use, parent.iuse.is_valid_flag, - eapi=parent.metadata["EAPI"]): + eapi=parent.eapi): use = self.depgraph._pkg_use_enabled(parent) solution = set() for flag, state in zip(affecting_use, use_state): diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py index 130ba2d0a..85e1dd7b0 100644 --- a/pym/_emerge/resolver/output.py +++ b/pym/_emerge/resolver/output.py @@ -249,7 +249,7 @@ class Display(object): use_expand = sorted(self.use_expand) use_expand.insert(0, "USE") - feature_flags = _get_feature_flags(_get_eapi_attrs(pkg.metadata["EAPI"])) + feature_flags = _get_feature_flags(_get_eapi_attrs(pkg.eapi)) for key in use_expand: if key in self.use_expand_hidden: |