[gentoo-commits] proj/portage:prefix commit in: bin/, pym/portage/

[Fabian Groffen]

commit:     d34d38d399483c69d4a50aca3877277cc6a77e58
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 25 08:34:25 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> 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",