| 1 |
Author: zmedico |
| 2 |
Date: 2008-12-02 22:39:22 +0000 (Tue, 02 Dec 2008) |
| 3 |
New Revision: 12137 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.6/bin/ebuild.sh |
| 7 |
Log: |
| 8 |
Skip sourcing of profile.bashrc during the depend phase. (trunk r12136) |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/branches/2.1.6/bin/ebuild.sh |
| 12 |
=================================================================== |
| 13 |
--- main/branches/2.1.6/bin/ebuild.sh 2008-12-02 22:33:44 UTC (rev 12136) |
| 14 |
+++ main/branches/2.1.6/bin/ebuild.sh 2008-12-02 22:39:22 UTC (rev 12137) |
| 15 |
@@ -1516,15 +1516,18 @@ |
| 16 |
fi |
| 17 |
|
| 18 |
local OCC="${CC}" OCXX="${CXX}" |
| 19 |
- # source the existing profile.bashrc's. |
| 20 |
- save_IFS |
| 21 |
- IFS=$'\n' |
| 22 |
- local path_array=($PROFILE_PATHS) |
| 23 |
- restore_IFS |
| 24 |
- for x in "${path_array[@]}" ; do |
| 25 |
- [ -f "${x}/profile.bashrc" ] && qa_source "${x}/profile.bashrc" |
| 26 |
- done |
| 27 |
|
| 28 |
+ if [[ $EBUILD_PHASE != depend ]] ; then |
| 29 |
+ # source the existing profile.bashrcs. |
| 30 |
+ save_IFS |
| 31 |
+ IFS=$'\n' |
| 32 |
+ local path_array=($PROFILE_PATHS) |
| 33 |
+ restore_IFS |
| 34 |
+ for x in "${path_array[@]}" ; do |
| 35 |
+ [ -f "$x/profile.bashrc" ] && qa_source "$x/profile.bashrc" |
| 36 |
+ done |
| 37 |
+ fi |
| 38 |
+ |
| 39 |
# We assume if people are changing shopts in their bashrc they do so at their |
| 40 |
# own peril. This is the ONLY non-portage bit of code that can change shopts |
| 41 |
# without a QA violation. |
Archives