diff options
| author | Simon Stelling <blubb@gentoo.org> | 2006-05-01 22:41:19 +0000 |
|---|---|---|
| committer | Simon Stelling <blubb@gentoo.org> | 2006-05-01 22:41:19 +0000 |
| commit | 6312a9476d03a460b8f944b988f1c6838344ce0d (patch) | |
| tree | b10e6031a18a271237e7b6fecd351a06e6eed680 | |
| parent | 250eb04e003b17ef89d2ba2ebf67a7a50ee7b254 (diff) | |
| download | portage-6312a9476d03a460b8f944b988f1c6838344ce0d.tar.gz portage-6312a9476d03a460b8f944b988f1c6838344ce0d.tar.bz2 portage-6312a9476d03a460b8f944b988f1c6838344ce0d.zip | |
don't let profile.env overwrite variables that are already set; bug 130229
svn path=/main/trunk/; revision=3300
| -rwxr-xr-x | bin/ebuild.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 1453827cf..e1851da04 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -44,7 +44,12 @@ alias restore_IFS='if [ "${old_IFS:-unset}" != "unset" ]; then IFS="${old_IFS}"; OCC="$CC" OCXX="$CXX" + +env_dump=$(export -p | egrep -v "( EBUILD_PHASE=| PORTAGE_BIN_PATH=| PORTAGE_PYM_PATH=)") source /etc/profile.env &>/dev/null +eval "${env_dump}" +unset env_dump + 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. |