| 1 |
Author: zmedico |
| 2 |
Date: 2009-04-30 07:28:57 +0000 (Thu, 30 Apr 2009) |
| 3 |
New Revision: 13545 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.6/bin/ebuild.sh |
| 7 |
Log: |
| 8 |
Put ebuild helpers at the absolute front of the PATH. (trunk r13404) |
| 9 |
|
| 10 |
Modified: main/branches/2.1.6/bin/ebuild.sh |
| 11 |
=================================================================== |
| 12 |
--- main/branches/2.1.6/bin/ebuild.sh 2009-04-30 07:28:45 UTC (rev 13544) |
| 13 |
+++ main/branches/2.1.6/bin/ebuild.sh 2009-04-30 07:28:57 UTC (rev 13545) |
| 14 |
@@ -71,8 +71,12 @@ |
| 15 |
# Unset some variables that break things. |
| 16 |
unset GZIP BZIP BZIP2 CDPATH GREP_OPTIONS GREP_COLOR GLOBIGNORE |
| 17 |
|
| 18 |
-export PATH="/usr/local/sbin:/sbin:/usr/sbin:$PORTAGE_BIN_PATH/ebuild-helpers:/usr/local/bin:/bin:/usr/bin:${ROOTPATH}" |
| 19 |
-[ ! -z "$PREROOTPATH" ] && export PATH="${PREROOTPATH%%:}:$PATH" |
| 20 |
+ROOTPATH=${ROOTPATH##:} |
| 21 |
+ROOTPATH=${ROOTPATH%%:} |
| 22 |
+PREROOTPATH=${PREROOTPATH##:} |
| 23 |
+PREROOTPATH=${PREROOTPATH%%:} |
| 24 |
+PATH=$PORTAGE_BIN_PATH/ebuild-helpers:$PREROOTPATH${PREROOTPATH:+:}/usr/local/sbin:/sbin:/usr/sbin:/usr/local/bin:/bin:/usr/bin${ROOTPATH:+:}$ROOTPATH |
| 25 |
+export PATH |
| 26 |
|
| 27 |
source "${PORTAGE_BIN_PATH}/isolated-functions.sh" &>/dev/null |
| 28 |
|
| 29 |
@@ -1913,8 +1917,7 @@ |
| 30 |
;; |
| 31 |
esac |
| 32 |
|
| 33 |
- export PATH="/usr/local/sbin:/sbin:/usr/sbin:${ebuild_helpers_path}:/usr/local/bin:/bin:/usr/bin:${ROOTPATH}" |
| 34 |
- [[ -n $PREROOTPATH ]] && export PATH="${PREROOTPATH%%:}:$PATH" |
| 35 |
+ PATH=$ebuild_helpers_path:$PREROOTPATH${PREROOTPATH:+:}/usr/local/sbin:/sbin:/usr/sbin:/usr/local/bin:/bin:/usr/bin${ROOTPATH:+:}$ROOTPATH |
| 36 |
unset ebuild_helpers_path |
| 37 |
|
| 38 |
if ! hasq $EBUILD_SH_ARGS clean depend help info nofetch ; then |
Archives