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 C82E5138334 for ; Mon, 25 Jun 2018 08:34:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5C424E098E; Mon, 25 Jun 2018 08:34:37 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 34F97E098E for ; Mon, 25 Jun 2018 08:34:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F25CD335CA0 for ; Mon, 25 Jun 2018 08:34:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D8183348 for ; Mon, 25 Jun 2018 08:34:33 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1529915665.d34d38d399483c69d4a50aca3877277cc6a77e58.grobian@gentoo> Subject: [gentoo-commits] proj/portage:prefix commit in: bin/, pym/portage/ X-VCS-Repository: proj/portage X-VCS-Files: bin/phase-helpers.sh pym/portage/const.py X-VCS-Directories: pym/portage/ bin/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: d34d38d399483c69d4a50aca3877277cc6a77e58 X-VCS-Branch: prefix Date: Mon, 25 Jun 2018 08:34:33 +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: 77947707-f34f-4ea8-8c6a-052a54f3dbf3 X-Archives-Hash: f58bcf095a369ff52eccc0f6e3d78af0 commit: d34d38d399483c69d4a50aca3877277cc6a77e58 Author: Fabian Groffen gentoo org> AuthorDate: Mon Jun 25 08:34:25 2018 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Mon Jun 25 08:34:25 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=d34d38d3 stacked-prefix: flag as Prefix modification bin/phase-helpers.sh | 2 ++ pym/portage/const.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh index c5a818db7..3775022e1 100644 --- a/bin/phase-helpers.sh +++ b/bin/phase-helpers.sh @@ -927,6 +927,7 @@ ___best_version_and_has_version_common() { fi ;; esac + # PREFIX LOCAL: stacked-prefix feature if ___eapi_has_prefix_variables && has "${root_arg}" '--host-root' '-b' && has stacked-prefix ${FEATURES} && @@ -940,6 +941,7 @@ ___best_version_and_has_version_common() { # In a "stacked prefix" we explicitly utilize this situation. "${FUNCNAME[1]}" "${atom}" && return 0 fi + # END PREFIX LOCAL if [[ -n $PORTAGE_IPC_DAEMON ]] ; then cmd+=("${PORTAGE_BIN_PATH}"/ebuild-ipc "${FUNCNAME[1]}" "${root}" "${atom}") diff --git a/pym/portage/const.py b/pym/portage/const.py index 342b09174..65bcf46f9 100644 --- a/pym/portage/const.py +++ b/pym/portage/const.py @@ -202,7 +202,7 @@ SUPPORTED_FEATURES = frozenset([ "splitdebug", "split-elog", "split-log", - "stacked-prefix", + "stacked-prefix", # PREFIX LOCAL "strict", "strict-keepdir", "stricter",