From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 043BB138010 for ; Wed, 26 Sep 2012 02:15:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8C789E07B2; Wed, 26 Sep 2012 02:15:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4325EE07B2 for ; Wed, 26 Sep 2012 02:15:15 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AD0E633D7D8 for ; Wed, 26 Sep 2012 02:15:14 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 90815E5440 for ; Wed, 26 Sep 2012 02:15:12 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1348625672.f7648d050e9f3936ff2bc278f6927aa0b901be50.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/, pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/depgraph.py pym/portage/eapi.py X-VCS-Directories: pym/portage/ pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: f7648d050e9f3936ff2bc278f6927aa0b901be50 X-VCS-Branch: master Date: Wed, 26 Sep 2012 02:15:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7568eda6-a641-418c-8180-295796eef99a X-Archives-Hash: fda8aa88fc91a9f8e6bbbb35449d9a82 commit: f7648d050e9f3936ff2bc278f6927aa0b901be50 Author: Zac Medico gentoo org> AuthorDate: Wed Sep 26 02:14:32 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Sep 26 02:14:32 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=f7648d05 _add_pkg_deps: use _get_eapi_attrs --- pym/_emerge/depgraph.py | 5 +++-- 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 d228694..dee3f1f 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 7c45843..4936e6c 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)),