[gentoo-commits] proj/portage:master commit in: bin/ebuild-helpers/xattr/, bin/ebuild-helpers/unprivileged/, ...

[Zac Medico]

commit:     886edf0d01a975b3e4da8c39f999c999242f042c
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 30 01:06:19 2018 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Dec 30 01:10:31 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=886edf0d

ebuild-helpers: fix PORTAGE_OVERRIDE_EPREFIX usage

In case PORTAGE_OVERRIDE_EPREFIX is modified in the environment,
the actual ebuild-helpers PATH will not match PORTAGE_OVERRIDE_EPREFIX.
Use the same ebuild-helpers pattern as the portageq wrapper script
since daeb75b345c4433218ab9e7a5319e8914092f048.

Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 bin/ebuild-helpers/bsd/sed            | 2 +-
 bin/ebuild-helpers/unprivileged/chown | 2 +-
 bin/ebuild-helpers/xattr/install      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/ebuild-helpers/bsd/sed b/bin/ebuild-helpers/bsd/sed
index 9a7f2d4bb..2c252bd01 100755
--- a/bin/ebuild-helpers/bsd/sed
+++ b/bin/ebuild-helpers/bsd/sed
@@ -15,7 +15,7 @@ else
 
 	for path in $PATH; do
 		if [[ -x ${path}/${scriptname} ]]; then
-			[[ ${path} == ${PORTAGE_OVERRIDE_EPREFIX}/usr/lib*/portage/* ]] && continue
+			[[ ${path} == */portage/*/ebuild-helpers* ]] && continue
 			[[ ${path} == */._portage_reinstall_.* ]] && continue
 			[[ ${path}/${scriptname} -ef ${scriptpath} ]] && continue
 			exec "${path}/${scriptname}" "$@"

diff --git a/bin/ebuild-helpers/unprivileged/chown b/bin/ebuild-helpers/unprivileged/chown
index b57dc8aad..6a8b264d2 100755
--- a/bin/ebuild-helpers/unprivileged/chown
+++ b/bin/ebuild-helpers/unprivileged/chown
@@ -11,7 +11,7 @@ IFS=':'
 
 for path in ${PATH}; do
 	[[ -x ${path}/${scriptname} ]] || continue
-	[[ ${path} == ${PORTAGE_OVERRIDE_EPREFIX}/usr/lib*/portage/* ]] && continue
+	[[ ${path} == */portage/*/ebuild-helpers* ]] && continue
 	[[ ${path} == */._portage_reinstall_.* ]] && continue
 	[[ ${path}/${scriptname} -ef ${scriptpath} ]] && continue
 	IFS=$' \t\n'

diff --git a/bin/ebuild-helpers/xattr/install b/bin/ebuild-helpers/xattr/install
index 4d596e148..171968ffd 100755
--- a/bin/ebuild-helpers/xattr/install
+++ b/bin/ebuild-helpers/xattr/install
@@ -28,7 +28,7 @@ IFS=':'
 set -f
 path=
 for x in ${PATH}; do
-	[[ ${x} == ${PORTAGE_OVERRIDE_EPREFIX}/usr/lib*/portage/* ]] && continue
+	[[ ${x} == */portage/*/ebuild-helpers* ]] && continue
 	[[ ${x} == */._portage_reinstall_.* ]] && continue
 	path+=":${x}"
 done