diff options
| author |   Benda Xu <heroxbd@gentoo.org> | 2018-12-21 00:43:13 +0800 |
|---|---|---|
| committer |   Zac Medico <zmedico@gentoo.org> | 2018-12-21 16:07:32 -0800 |
| commit | daeb75b345c4433218ab9e7a5319e8914092f048 (patch) | |
| tree | f94101ebc2351590937a86bc5d2be07a9a328b7c /bin/ebuild-helpers | |
| parent | man: fix random bad double spaces (diff) | |
| download | portage-daeb75b345c4433218ab9e7a5319e8914092f048.tar.gz portage-daeb75b345c4433218ab9e7a5319e8914092f048.tar.bz2 portage-daeb75b345c4433218ab9e7a5319e8914092f048.zip | |
bin/ebuild-helpers/portageq: match against portage/bin/ebuild-helpers
In case PORTAGE_OVERRIDE_EPREFIX is modified in the environment,
the actual ebuild-helpers PATH will not match PORTAGE_OVERRIDE_EPREFIX.
Closes: https://github.com/gentoo/portage/pull/389
Signed-off-by: Zac Medico <zmedico@gentoo.org>
Diffstat (limited to 'bin/ebuild-helpers')
| -rwxr-xr-x | bin/ebuild-helpers/portageq | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/ebuild-helpers/portageq b/bin/ebuild-helpers/portageq index b314bce9f..45fa85d86 100755 --- a/bin/ebuild-helpers/portageq +++ b/bin/ebuild-helpers/portageq @@ -13,7 +13,7 @@ set -f # in case ${PATH} contains any shell glob characters 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 PYTHONPATH=${PORTAGE_PYTHONPATH:-${PORTAGE_PYM_PATH}} \ |