From 1feeb2804ba52aa215646fe07bbd19213aa424b7 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 2 Dec 2008 22:39:22 +0000 Subject: Skip sourcing of profile.bashrc during the depend phase. (trunk r12136) svn path=/main/branches/2.1.6/; revision=12137 --- bin/ebuild.sh | 19 +++++++++++-------- 1 file 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 -- cgit v1.2.3-1-g7c22