From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B8FA81382C5 for ; Mon, 16 Apr 2018 01:43:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 86F1EE092D; Mon, 16 Apr 2018 01:43:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5434FE0921 for ; Mon, 16 Apr 2018 01:43:44 +0000 (UTC) Received: from localhost.localdomain (ip68-4-233-67.oc.oc.cox.net [68.4.233.67]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: zmedico) by smtp.gentoo.org (Postfix) with ESMTPSA id EE89A335C06; Mon, 16 Apr 2018 01:43:42 +0000 (UTC) From: Zac Medico To: gentoo-portage-dev@lists.gentoo.org Cc: Zac Medico Subject: [gentoo-portage-dev] [PATCH] config.environ(): filter PORTDIR only when required (bug 653230) Date: Sun, 15 Apr 2018 18:41:31 -0700 Message-Id: <20180416014131.24330-1-zmedico@gentoo.org> X-Mailer: git-send-email 2.13.6 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-portage-dev@lists.gentoo.org Reply-to: gentoo-portage-dev@lists.gentoo.org X-Archives-Salt: d35d79f6-6069-4711-9b2d-cd9e4cb296bc X-Archives-Hash: ea185a43cdc4c4b87297bcea01fbad54 The changes related bug 373349 were more aggressive than necessary, causing the PORTDIR variable to be omitted from config.environ() calls when the EAPI is defined. We really only need to filter the PORTDIR variable when the current EAPI requires it. Fixes: 802e7d0bdd96 ("Do not export PORTDIR & ECLASSDIR in EAPI 7") Bug: https://bugs.gentoo.org/653230 --- pym/portage/eapi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pym/portage/eapi.py b/pym/portage/eapi.py index cdbbf07fb..b0f993a14 100644 --- a/pym/portage/eapi.py +++ b/pym/portage/eapi.py @@ -159,7 +159,7 @@ def _get_eapi_attrs(eapi): dots_in_use_flags = (eapi is None or eapi_allows_dots_in_use_flags(eapi)), empty_groups_always_true = (eapi is not None and eapi_empty_groups_always_true(eapi)), exports_EBUILD_PHASE_FUNC = (eapi is None or eapi_exports_EBUILD_PHASE_FUNC(eapi)), - exports_PORTDIR = (eapi is not None and eapi_exports_PORTDIR(eapi)), + exports_PORTDIR = (eapi is None or eapi_exports_PORTDIR(eapi)), exports_ECLASSDIR = (eapi is not None and eapi_exports_ECLASSDIR(eapi)), feature_flag_test = True, feature_flag_targetroot = (eapi is not None and eapi_has_targetroot(eapi)), -- 2.13.6