| 1 |
Author: zmedico |
| 2 |
Date: 2009-04-30 07:00:47 +0000 (Thu, 30 Apr 2009) |
| 3 |
New Revision: 13472 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.6/bin/ebuild.sh |
| 7 |
Log: |
| 8 |
Call _ebuild_phase_funcs() from ebuild_main() since it needs to be called for |
| 9 |
every phase (for EAPI 2 default() phase function setup). (trunk r13301) |
| 10 |
|
| 11 |
Modified: main/branches/2.1.6/bin/ebuild.sh |
| 12 |
=================================================================== |
| 13 |
--- main/branches/2.1.6/bin/ebuild.sh 2009-04-30 07:00:35 UTC (rev 13471) |
| 14 |
+++ main/branches/2.1.6/bin/ebuild.sh 2009-04-30 07:00:47 UTC (rev 13472) |
| 15 |
@@ -1861,11 +1861,6 @@ |
| 16 |
done |
| 17 |
[[ -n $DEFINED_PHASES ]] || DEFINED_PHASES=- |
| 18 |
|
| 19 |
- if [[ -n $EBUILD_PHASE && $EBUILD_PHASE != depend ]] ; then |
| 20 |
- local phase_func=$(_ebuild_arg_to_phase "$EAPI" "$EBUILD_PHASE") |
| 21 |
- [[ -n $phase_func ]] && _ebuild_phase_funcs "$EAPI" "$phase_func" |
| 22 |
- fi |
| 23 |
- |
| 24 |
# This needs to be exported since prepstrip is a separate shell script. |
| 25 |
[[ -n $QA_PRESTRIPPED ]] && export QA_PRESTRIPPED |
| 26 |
} |
| 27 |
@@ -1933,6 +1928,11 @@ |
| 28 |
fi |
| 29 |
fi |
| 30 |
|
| 31 |
+ if [[ $EBUILD_PHASE != depend ]] ; then |
| 32 |
+ local phase_func=$(_ebuild_arg_to_phase "$EAPI" "$EBUILD_PHASE") |
| 33 |
+ [[ -n $phase_func ]] && _ebuild_phase_funcs "$EAPI" "$phase_func" |
| 34 |
+ fi |
| 35 |
+ |
| 36 |
source_all_bashrcs |
| 37 |
|
| 38 |
case ${EBUILD_SH_ARGS} in |
Archives