From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 1 Dec 2008 18:59:49 +0000 (-0000)
Subject: Fix inconsistencies between the "clean" and "cleanrm" phases.
X-Git-Tag: v2.2_rc17~15
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6bd289aa240aeb7f77389814ba5ad7e13fc09432;p=portage.git

Fix inconsistencies between the "clean" and "cleanrm" phases.

svn path=/main/trunk/; revision=12126
---

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