diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2018-12-29 17:13:14 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2018-12-29 17:18:56 -0800 |
| commit | b7f053d36f4ea0dd7c1fb109f8bc3dd0f678059a (patch) | |
| tree | a19c8630d384de63ec61b4831b098181f06ed1c0 /bin | |
| parent | ebuild-helpers: fix PORTAGE_OVERRIDE_EPREFIX usage (diff) | |
| download | portage-b7f053d36f4ea0dd7c1fb109f8bc3dd0f678059a.tar.gz portage-b7f053d36f4ea0dd7c1fb109f8bc3dd0f678059a.tar.bz2 portage-b7f053d36f4ea0dd7c1fb109f8bc3dd0f678059a.zip | |
ebuild-helpers: remove redunant _portage_reinstall_ pattern
The _portage_reinstall_ pattern is now redundant because it would match
${PORTAGE_TMPDIR}/portage/._portage_reinstall_.*/ebuild-helpers* paths
that */portage/*/ebuild-helpers* would also match.
Signed-off-by: Zac Medico <zmedico@gentoo.org>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/ebuild-helpers/bsd/sed | 1 | ||||
| -rwxr-xr-x | bin/ebuild-helpers/portageq | 1 | ||||
| -rwxr-xr-x | bin/ebuild-helpers/unprivileged/chown | 1 | ||||
| -rwxr-xr-x | bin/ebuild-helpers/xattr/install | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/bin/ebuild-helpers/bsd/sed b/bin/ebuild-helpers/bsd/sed index 2c252bd01..8bece09cd 100755 --- a/bin/ebuild-helpers/bsd/sed +++ b/bin/ebuild-helpers/bsd/sed @@ -16,7 +16,6 @@ else for path in $PATH; do if [[ -x ${path}/${scriptname} ]]; then [[ ${path} == */portage/*/ebuild-helpers* ]] && continue - [[ ${path} == */._portage_reinstall_.* ]] && continue [[ ${path}/${scriptname} -ef ${scriptpath} ]] && continue exec "${path}/${scriptname}" "$@" exit 0 diff --git a/bin/ebuild-helpers/portageq b/bin/ebuild-helpers/portageq index 45fa85d86..d31bd6810 100755 --- a/bin/ebuild-helpers/portageq +++ b/bin/ebuild-helpers/portageq @@ -14,7 +14,6 @@ set -f # in case ${PATH} contains any shell glob characters for path in ${PATH}; do [[ -x ${path}/${scriptname} ]] || continue [[ ${path} == */portage/*/ebuild-helpers* ]] && continue - [[ ${path} == */._portage_reinstall_.* ]] && continue [[ ${path}/${scriptname} -ef ${scriptpath} ]] && continue PYTHONPATH=${PORTAGE_PYTHONPATH:-${PORTAGE_PYM_PATH}} \ exec "${PORTAGE_PYTHON:-/usr/bin/python}" \ diff --git a/bin/ebuild-helpers/unprivileged/chown b/bin/ebuild-helpers/unprivileged/chown index 6a8b264d2..a7a4ff447 100755 --- a/bin/ebuild-helpers/unprivileged/chown +++ b/bin/ebuild-helpers/unprivileged/chown @@ -12,7 +12,6 @@ IFS=':' for path in ${PATH}; do [[ -x ${path}/${scriptname} ]] || continue [[ ${path} == */portage/*/ebuild-helpers* ]] && continue - [[ ${path} == */._portage_reinstall_.* ]] && continue [[ ${path}/${scriptname} -ef ${scriptpath} ]] && continue IFS=$' \t\n' output=$("${path}/${scriptname}" "$@" 2>&1) diff --git a/bin/ebuild-helpers/xattr/install b/bin/ebuild-helpers/xattr/install index 171968ffd..e5bb10895 100755 --- a/bin/ebuild-helpers/xattr/install +++ b/bin/ebuild-helpers/xattr/install @@ -29,7 +29,6 @@ set -f path= for x in ${PATH}; do [[ ${x} == */portage/*/ebuild-helpers* ]] && continue - [[ ${x} == */._portage_reinstall_.* ]] && continue path+=":${x}" done PATH=${path#:} |