| 1 |
Author: zmedico |
| 2 |
Date: 2008-12-01 19:06:29 +0000 (Mon, 01 Dec 2008) |
| 3 |
New Revision: 12129 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.6/bin/ebuild.sh |
| 7 |
Log: |
| 8 |
Fix inconsistencies between the "clean" and "cleanrm" phases. (trunk r12126) |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/branches/2.1.6/bin/ebuild.sh |
| 12 |
=================================================================== |
| 13 |
--- main/branches/2.1.6/bin/ebuild.sh 2008-12-01 19:04:53 UTC (rev 12128) |
| 14 |
+++ main/branches/2.1.6/bin/ebuild.sh 2008-12-01 19:06:29 UTC (rev 12129) |
| 15 |
@@ -1797,7 +1797,7 @@ |
| 16 |
unset BIN_PATH BIN BODY FUNC_SRC |
| 17 |
fi |
| 18 |
|
| 19 |
-if ! hasq ${EBUILD_PHASE} clean depend && \ |
| 20 |
+if ! hasq "$EBUILD_PHASE" clean cleanrm depend && \ |
| 21 |
[ -f "${T}"/environment ] ; then |
| 22 |
# The environment may have been extracted from environment.bz2 or |
| 23 |
# may have come from another version of ebuild.sh or something. |
| 24 |
@@ -1843,7 +1843,7 @@ |
| 25 |
source_all_bashrcs |
| 26 |
fi |
| 27 |
|
| 28 |
-if ! hasq ${EBUILD_PHASE} clean && \ |
| 29 |
+if ! hasq "$EBUILD_PHASE" clean cleanrm && \ |
| 30 |
( |
| 31 |
hasq ${EBUILD_PHASE} depend || \ |
| 32 |
[ ! -f "${T}"/environment ] || \ |
| 33 |
@@ -1889,7 +1889,7 @@ |
| 34 |
[[ -n $EAPI ]] || EAPI=0 |
| 35 |
|
| 36 |
# enable bashrc support for the clean phase |
| 37 |
-[[ ${EBUILD_PHASE} == clean ]] && source_all_bashrcs |
| 38 |
+hasq "$EBUILD_PHASE" clean cleanrm && source_all_bashrcs |
| 39 |
|
| 40 |
# unset USE_EXPAND variables that contain only the special "*" token |
| 41 |
for x in ${USE_EXPAND} ; do |
Archives