1 |
Author: zmedico |
2 |
Date: 2009-04-08 19:37:25 +0000 (Wed, 08 Apr 2009) |
3 |
New Revision: 13299 |
4 |
|
5 |
Modified: |
6 |
main/trunk/bin/ebuild.sh |
7 |
main/trunk/bin/isolated-functions.sh |
8 |
Log: |
9 |
Move the ebuild sourcing code into a new _source_ebuild() function. |
10 |
|
11 |
|
12 |
Modified: main/trunk/bin/ebuild.sh |
13 |
=================================================================== |
14 |
--- main/trunk/bin/ebuild.sh 2009-04-08 03:11:01 UTC (rev 13298) |
15 |
+++ main/trunk/bin/ebuild.sh 2009-04-08 19:37:25 UTC (rev 13299) |
16 |
@@ -1802,11 +1802,7 @@ |
17 |
unset PORTAGE_SANDBOX_ON |
18 |
fi |
19 |
|
20 |
-if ! hasq "$EBUILD_PHASE" clean cleanrm ; then |
21 |
-if [[ $EBUILD_PHASE = depend || ! -f $T/environment || \ |
22 |
- -f $PORTAGE_BUILDDIR/.ebuild_changed ]] || \ |
23 |
- hasq noauto $FEATURES ; then |
24 |
- |
25 |
+_source_ebuild() { |
26 |
# The bashrcs get an opportunity here to set aliases that will be expanded |
27 |
# during sourcing of ebuilds and eclasses. |
28 |
source_all_bashrcs |
29 |
@@ -1845,8 +1841,15 @@ |
30 |
|
31 |
# This needs to be exported since prepstrip is a separate shell script. |
32 |
[[ -n $QA_PRESTRIPPED ]] && export QA_PRESTRIPPED |
33 |
+} |
34 |
+ |
35 |
+if ! hasq "$EBUILD_PHASE" clean cleanrm ; then |
36 |
+ if [[ $EBUILD_PHASE = depend || ! -f $T/environment || \ |
37 |
+ -f $PORTAGE_BUILDDIR/.ebuild_changed ]] || \ |
38 |
+ hasq noauto $FEATURES ; then |
39 |
+ _source_ebuild |
40 |
+ fi |
41 |
fi |
42 |
-fi |
43 |
|
44 |
# Set default EAPI if necessary, so that most |
45 |
# code can simply assume that it's defined. |
46 |
|
47 |
Modified: main/trunk/bin/isolated-functions.sh |
48 |
=================================================================== |
49 |
--- main/trunk/bin/isolated-functions.sh 2009-04-08 03:11:01 UTC (rev 13298) |
50 |
+++ main/trunk/bin/isolated-functions.sh 2009-04-08 19:37:25 UTC (rev 13299) |
51 |
@@ -518,6 +518,7 @@ |
52 |
source_all_bashrcs ebuild_main \ |
53 |
ebuild_phase ebuild_phase_with_hooks \ |
54 |
_ebuild_arg_to_phase _ebuild_phase_funcs default \ |
55 |
+ _source_ebuild \ |
56 |
${QA_INTERCEPTORS} |
57 |
|
58 |
# portage config variables and variables set directly by portage |