diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-09-25 19:14:32 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-09-25 19:14:32 -0700 |
| commit | f7648d050e9f3936ff2bc278f6927aa0b901be50 (patch) | |
| tree | b68d33ebbca0004fa03f810908a6abd4fa6f25f7 | |
| parent | 15a7519049e47f726a37f985b7c4a559b47dae16 (diff) | |
| download | portage-f7648d050e9f3936ff2bc278f6927aa0b901be50.tar.gz portage-f7648d050e9f3936ff2bc278f6927aa0b901be50.tar.bz2 portage-f7648d050e9f3936ff2bc278f6927aa0b901be50.zip | |
_add_pkg_deps: use _get_eapi_attrs
| -rw-r--r-- | pym/_emerge/depgraph.py | 5 | ||||
| -rw-r--r-- | pym/portage/eapi.py | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index d228694ba..dee3f1f91 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -24,7 +24,7 @@ from portage.dep import Atom, best_match_to_list, extract_affecting_use, \ _repo_separator from portage.dep._slot_operator import ignore_built_slot_operator_deps from portage.eapi import eapi_has_strong_blocks, eapi_has_required_use, \ - _get_eapi_attrs, eapi_has_hdepend + _get_eapi_attrs from portage.exception import (InvalidAtom, InvalidDependString, PackageNotFound, PortageException) from portage.output import colorize, create_color_func, \ @@ -1679,6 +1679,7 @@ class depgraph(object): myroot = pkg.root metadata = pkg.metadata removal_action = "remove" in self._dynamic_config.myparams + eapi_attrs = _get_eapi_attrs(pkg.metadata["EAPI"]) edepend={} depkeys = ["DEPEND","RDEPEND","PDEPEND","HDEPEND"] @@ -1718,7 +1719,7 @@ class depgraph(object): if removal_action: depend_root = myroot else: - if eapi_has_hdepend(pkg.metadata['EAPI']): + if eapi_attrs.hdepend: depend_root = myroot else: depend_root = self._frozen_config._running_root.root diff --git a/pym/portage/eapi.py b/pym/portage/eapi.py index 7c4584382..4936e6cd7 100644 --- a/pym/portage/eapi.py +++ b/pym/portage/eapi.py @@ -91,7 +91,8 @@ def eapi_has_targetroot(eapi): _eapi_attrs = collections.namedtuple('_eapi_attrs', 'dots_in_PN dots_in_use_flags exports_EBUILD_PHASE_FUNC ' - 'feature_flag_test feature_flag_targetroot iuse_defaults iuse_effective ' + 'feature_flag_test feature_flag_targetroot ' + 'hdepend iuse_defaults iuse_effective ' 'repo_deps required_use required_use_at_most_one_of slot_operator slot_deps ' 'src_uri_arrows strong_blocks use_deps use_dep_defaults') @@ -118,7 +119,8 @@ def _get_eapi_attrs(eapi): dots_in_use_flags = (eapi is None or eapi_allows_dots_in_use_flags(eapi)), exports_EBUILD_PHASE_FUNC = (eapi is None or eapi_exports_EBUILD_PHASE_FUNC(eapi)), feature_flag_test = True, - feature_flag_targetroot = eapi_has_targetroot(eapi), + feature_flag_targetroot = (eapi is not None and eapi_has_targetroot(eapi)), + hdepend = (eapi is not None and eapi_has_hdepend(eapi)), iuse_defaults = (eapi is None or eapi_has_iuse_defaults(eapi)), iuse_effective = (eapi is not None and eapi_has_iuse_effective(eapi)), repo_deps = (eapi is None or eapi_has_repo_deps(eapi)), |