summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-12-02 22:33:44 +0000
committerZac Medico <zmedico@gentoo.org>2008-12-02 22:33:44 +0000
commitee562f352dd15a402b5f4b713b50a0e4ea9ce438 (patch)
tree2d4993ee61ccfea908868a278748ba97800ecb41
parent1d7798a2fb86b5c5d4e2ad6a3d8bf0810f60fff4 (diff)
downloadportage-ee562f352dd15a402b5f4b713b50a0e4ea9ce438.tar.gz
portage-ee562f352dd15a402b5f4b713b50a0e4ea9ce438.tar.bz2
portage-ee562f352dd15a402b5f4b713b50a0e4ea9ce438.zip
Skip sourcinf of profile.bashrc during the depend phase.
svn path=/main/trunk/; revision=12136
-rwxr-xr-xbin/ebuild.sh19
1 files changed, 11 insertions, 8 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 197be2696..0a16e8a7a 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1516,14 +1516,17 @@ source_all_bashrcs() {
fi
local OCC="${CC}" OCXX="${CXX}"
- # source the existing profile.bashrc's.
- save_IFS
- IFS=$'\n'
- local path_array=($PROFILE_PATHS)
- restore_IFS
- for x in "${path_array[@]}" ; do
- [ -f "${x}/profile.bashrc" ] && qa_source "${x}/profile.bashrc"
- done
+
+ if [[ $EBUILD_PHASE != depend ]] ; then
+ # source the existing profile.bashrcs.
+ save_IFS
+ IFS=$'\n'
+ local path_array=($PROFILE_PATHS)
+ restore_IFS
+ for x in "${path_array[@]}" ; do
+ [ -f "$x/profile.bashrc" ] && qa_source "$x/profile.bashrc"
+ done
+ fi
# We assume if people are changing shopts in their bashrc they do so at their
# own peril. This is the ONLY non-portage bit of code that can change shopts