diff options
author | Zac Medico <zmedico@gentoo.org> | 2006-06-21 02:52:35 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2006-06-21 02:52:35 +0000 |
commit | c69443145f90fe469381c1115a0d7de489a5ee8b (patch) | |
tree | 85415b689191480ebb3619f36f9e9f9ace12ae17 | |
parent | 21383934708fe77241eeb74dba0106b38e55a913 (diff) | |
download | portage-c69443145f90fe469381c1115a0d7de489a5ee8b.tar.gz portage-c69443145f90fe469381c1115a0d7de489a5ee8b.tar.bz2 portage-c69443145f90fe469381c1115a0d7de489a5ee8b.zip |
Source /etc/portage/bashrc after the profile.bashrcs, since user env should be able to override the profile env. This patch is from trunk r3508.
svn path=/main/branches/2.1/; revision=3570
-rwxr-xr-x | bin/ebuild.sh | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 49cea8de8..db2aafe8a 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -47,20 +47,6 @@ OCXX="$CXX" source /etc/profile.env &>/dev/null -if [ -f "${PORTAGE_BASHRC}" ]; then - # If $- contains x, then tracing has already enabled elsewhere for some - # reason. We preserve it's state so as not to interfere. - if [ "$PORTAGE_DEBUG" != "1" ] || [ "${-/x/}" != "$-" ]; then - source "${PORTAGE_BASHRC}" - else - set -x - source "${PORTAGE_BASHRC}" - set +x - fi -fi -[ ! -z "$OCC" ] && export CC="$OCC" -[ ! -z "$OCXX" ] && export CXX="$OCXX" - export PATH="/usr/local/sbin:/sbin:/usr/sbin:${PORTAGE_BIN_PATH}:/usr/local/bin:/bin:/usr/bin:${ROOTPATH}" [ ! -z "$PREROOTPATH" ] && export PATH="${PREROOTPATH%%:}:$PATH" @@ -116,6 +102,20 @@ for dir in ${PROFILE_PATHS}; do done restore_IFS +if [ -f "${PORTAGE_BASHRC}" ]; then + # If $- contains x, then tracing has already enabled elsewhere for some + # reason. We preserve it's state so as not to interfere. + if [ "$PORTAGE_DEBUG" != "1" ] || [ "${-/x/}" != "$-" ]; then + source "${PORTAGE_BASHRC}" + else + set -x + source "${PORTAGE_BASHRC}" + set +x + fi +fi + +[ ! -z "$OCC" ] && export CC="$OCC" +[ ! -z "$OCXX" ] && export CXX="$OCXX" esyslog() { # Custom version of esyslog() to take care of the "Red Star" bug. |