| 1 |
commit: b7f053d36f4ea0dd7c1fb109f8bc3dd0f678059a |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 30 01:13:14 2018 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 30 01:18:56 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=b7f053d3 |
| 7 |
|
| 8 |
ebuild-helpers: remove redunant _portage_reinstall_ pattern |
| 9 |
|
| 10 |
The _portage_reinstall_ pattern is now redundant because it would match |
| 11 |
${PORTAGE_TMPDIR}/portage/._portage_reinstall_.*/ebuild-helpers* paths |
| 12 |
that */portage/*/ebuild-helpers* would also match. |
| 13 |
|
| 14 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
| 15 |
|
| 16 |
bin/ebuild-helpers/bsd/sed | 1 - |
| 17 |
bin/ebuild-helpers/portageq | 1 - |
| 18 |
bin/ebuild-helpers/unprivileged/chown | 1 - |
| 19 |
bin/ebuild-helpers/xattr/install | 1 - |
| 20 |
4 files changed, 4 deletions(-) |
| 21 |
|
| 22 |
diff --git a/bin/ebuild-helpers/bsd/sed b/bin/ebuild-helpers/bsd/sed |
| 23 |
index 2c252bd01..8bece09cd 100755 |
| 24 |
--- a/bin/ebuild-helpers/bsd/sed |
| 25 |
+++ b/bin/ebuild-helpers/bsd/sed |
| 26 |
@@ -16,7 +16,6 @@ else |
| 27 |
for path in $PATH; do |
| 28 |
if [[ -x ${path}/${scriptname} ]]; then |
| 29 |
[[ ${path} == */portage/*/ebuild-helpers* ]] && continue |
| 30 |
- [[ ${path} == */._portage_reinstall_.* ]] && continue |
| 31 |
[[ ${path}/${scriptname} -ef ${scriptpath} ]] && continue |
| 32 |
exec "${path}/${scriptname}" "$@" |
| 33 |
exit 0 |
| 34 |
|
| 35 |
diff --git a/bin/ebuild-helpers/portageq b/bin/ebuild-helpers/portageq |
| 36 |
index 45fa85d86..d31bd6810 100755 |
| 37 |
--- a/bin/ebuild-helpers/portageq |
| 38 |
+++ b/bin/ebuild-helpers/portageq |
| 39 |
@@ -14,7 +14,6 @@ set -f # in case ${PATH} contains any shell glob characters |
| 40 |
for path in ${PATH}; do |
| 41 |
[[ -x ${path}/${scriptname} ]] || continue |
| 42 |
[[ ${path} == */portage/*/ebuild-helpers* ]] && continue |
| 43 |
- [[ ${path} == */._portage_reinstall_.* ]] && continue |
| 44 |
[[ ${path}/${scriptname} -ef ${scriptpath} ]] && continue |
| 45 |
PYTHONPATH=${PORTAGE_PYTHONPATH:-${PORTAGE_PYM_PATH}} \ |
| 46 |
exec "${PORTAGE_PYTHON:-/usr/bin/python}" \ |
| 47 |
|
| 48 |
diff --git a/bin/ebuild-helpers/unprivileged/chown b/bin/ebuild-helpers/unprivileged/chown |
| 49 |
index 6a8b264d2..a7a4ff447 100755 |
| 50 |
--- a/bin/ebuild-helpers/unprivileged/chown |
| 51 |
+++ b/bin/ebuild-helpers/unprivileged/chown |
| 52 |
@@ -12,7 +12,6 @@ IFS=':' |
| 53 |
for path in ${PATH}; do |
| 54 |
[[ -x ${path}/${scriptname} ]] || continue |
| 55 |
[[ ${path} == */portage/*/ebuild-helpers* ]] && continue |
| 56 |
- [[ ${path} == */._portage_reinstall_.* ]] && continue |
| 57 |
[[ ${path}/${scriptname} -ef ${scriptpath} ]] && continue |
| 58 |
IFS=$' \t\n' |
| 59 |
output=$("${path}/${scriptname}" "$@" 2>&1) |
| 60 |
|
| 61 |
diff --git a/bin/ebuild-helpers/xattr/install b/bin/ebuild-helpers/xattr/install |
| 62 |
index 171968ffd..e5bb10895 100755 |
| 63 |
--- a/bin/ebuild-helpers/xattr/install |
| 64 |
+++ b/bin/ebuild-helpers/xattr/install |
| 65 |
@@ -29,7 +29,6 @@ set -f |
| 66 |
path= |
| 67 |
for x in ${PATH}; do |
| 68 |
[[ ${x} == */portage/*/ebuild-helpers* ]] && continue |
| 69 |
- [[ ${x} == */._portage_reinstall_.* ]] && continue |
| 70 |
path+=":${x}" |
| 71 |
done |
| 72 |
PATH=${path#:} |
Archives