summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-12-01 18:59:49 +0000
committerZac Medico <zmedico@gentoo.org>2008-12-01 18:59:49 +0000
commit6bd289aa240aeb7f77389814ba5ad7e13fc09432 (patch)
tree9c668505e625ba0dd1ede126c31df8f3dc1baf85
parente0a2e5c29ef332bdac449bb9b0b21b588ccc4f98 (diff)
downloadportage-6bd289aa240aeb7f77389814ba5ad7e13fc09432.tar.gz
portage-6bd289aa240aeb7f77389814ba5ad7e13fc09432.tar.bz2
portage-6bd289aa240aeb7f77389814ba5ad7e13fc09432.zip
Fix inconsistencies between the "clean" and "cleanrm" phases.
svn path=/main/trunk/; revision=12126
-rwxr-xr-xbin/ebuild.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 72f1f5acf..87f94717b 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1797,7 +1797,7 @@ if [[ -n ${QA_INTERCEPTORS} ]] ; then
unset BIN_PATH BIN BODY FUNC_SRC
fi
-if ! hasq ${EBUILD_PHASE} clean depend && \
+if ! hasq "$EBUILD_PHASE" clean cleanrm depend && \
[ -f "${T}"/environment ] ; then
# The environment may have been extracted from environment.bz2 or
# may have come from another version of ebuild.sh or something.
@@ -1843,7 +1843,7 @@ if ! hasq ${EBUILD_PHASE} clean depend && \
source_all_bashrcs
fi
-if ! hasq ${EBUILD_PHASE} clean && \
+if ! hasq "$EBUILD_PHASE" clean cleanrm && \
(
hasq ${EBUILD_PHASE} depend || \
[ ! -f "${T}"/environment ] || \
@@ -1889,7 +1889,7 @@ fi
[[ -n $EAPI ]] || EAPI=0
# enable bashrc support for the clean phase
-[[ ${EBUILD_PHASE} == clean ]] && source_all_bashrcs
+hasq "$EBUILD_PHASE" clean cleanrm && source_all_bashrcs
# unset USE_EXPAND variables that contain only the special "*" token
for x in ${USE_EXPAND} ; do