From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 6 Aug 2009 19:26:48 +0000 (-0000)
Subject: Bug #277537 - Synchronize order of PATH elements with the order defined by
X-Git-Tag: v2.2_rc37~31
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2eab6930cc67c631b679b55f0b588e4f625ebb19;p=portage.git

Bug #277537 - Synchronize order of PATH elements with the order defined by
/etc/profile (promote paths under /usr to the front). Thanks to Michał Górny
<gentoo@mgorny.alt.pl>.

svn path=/main/trunk/; revision=13935
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 3ee9be0a6..0483046fa 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -22,7 +22,7 @@ ROOTPATH=${ROOTPATH##:}
 ROOTPATH=${ROOTPATH%%:}
 PREROOTPATH=${PREROOTPATH##:}
 PREROOTPATH=${PREROOTPATH%%:}
-PATH=$PORTAGE_BIN_PATH/ebuild-helpers:$PREROOTPATH${PREROOTPATH:+:}/usr/local/sbin:/sbin:/usr/sbin:/usr/local/bin:/bin:/usr/bin${ROOTPATH:+:}$ROOTPATH
+PATH=$PORTAGE_BIN_PATH/ebuild-helpers:$PREROOTPATH${PREROOTPATH:+:}/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin${ROOTPATH:+:}$ROOTPATH
 export PATH
 
 # These two functions wrap sourcing and calling respectively.  At present they
@@ -1891,7 +1891,7 @@ ebuild_main() {
 			;;
 	esac
 
-	PATH=$ebuild_helpers_path:$PREROOTPATH${PREROOTPATH:+:}/usr/local/sbin:/sbin:/usr/sbin:/usr/local/bin:/bin:/usr/bin${ROOTPATH:+:}$ROOTPATH
+	PATH=$ebuild_helpers_path:$PREROOTPATH${PREROOTPATH:+:}/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin${ROOTPATH:+:}$ROOTPATH
 	unset ebuild_helpers_path
 
 	if ! hasq $EBUILD_SH_ARGS clean depend help info nofetch ; then