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 B9874138010 for ; Thu, 27 Sep 2012 16:58:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 24F6521C01A; Thu, 27 Sep 2012 16:58:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id EB43321C01A for ; Thu, 27 Sep 2012 16:58:47 +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 58AFC33C900 for ; Thu, 27 Sep 2012 16:58:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id BD769E5449 for ; Thu, 27 Sep 2012 16:58:45 +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: <1348765115.a6cfb7dc96cf015d3867929ab0dece49fb69ded0.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/dep/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/dep/_slot_operator.py X-VCS-Directories: pym/portage/dep/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: a6cfb7dc96cf015d3867929ab0dece49fb69ded0 X-VCS-Branch: master Date: Thu, 27 Sep 2012 16:58:45 +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: 4a17976e-b320-432a-b125-7cc340dea7cf X-Archives-Hash: 11de65080b299be6ddaa566386dd59f2 commit: a6cfb7dc96cf015d3867929ab0dece49fb69ded0 Author: Zac Medico gentoo org> AuthorDate: Thu Sep 27 16:58:35 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Sep 27 16:58:35 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a6cfb7dc _slot_operator: EAPI 5-hdepend DEPEND target only --- pym/portage/dep/_slot_operator.py | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pym/portage/dep/_slot_operator.py b/pym/portage/dep/_slot_operator.py index c98c974..ae58862 100644 --- a/pym/portage/dep/_slot_operator.py +++ b/pym/portage/dep/_slot_operator.py @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 from portage.dep import Atom, paren_enclose, use_reduce +from portage.eapi import _get_eapi_attrs from portage.exception import InvalidData from _emerge.Package import Package @@ -37,6 +38,7 @@ def evaluate_slot_operator_equal_deps(settings, use, trees): metadata = settings.configdict['pkg'] eapi = metadata['EAPI'] + eapi_attrs = _get_eapi_attrs(eapi) running_vardb = trees[trees._running_eroot]["vartree"].dbapi target_vardb = trees[trees._target_eroot]["vartree"].dbapi vardbs = [target_vardb] @@ -48,11 +50,13 @@ def evaluate_slot_operator_equal_deps(settings, use, trees): for k in Package._runtime_keys: _eval_deps(deps[k], vardbs) - if running_vardb is not target_vardb: - vardbs.append(running_vardb) - - _eval_deps(deps["DEPEND"], vardbs) - _eval_deps(deps["HDEPEND"], [running_vardb]) + if eapi_attrs.hdepend: + _eval_deps(deps["HDEPEND"], [running_vardb]) + _eval_deps(deps["DEPEND"], [target_vardb]) + else: + if running_vardb is not target_vardb: + vardbs.append(running_vardb) + _eval_deps(deps["DEPEND"], vardbs) result = {} for k, v in deps.items():