diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2008-12-01 19:06:29 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-12-01 19:06:29 +0000 |
| commit | 91ce7faffeb61e66c3377b81d5fe3fca00151c3b (patch) | |
| tree | fabb6f3dc5b812360330364b5590b53447395248 | |
| parent | Bug #249185 - For more useful output in cases when one or more USE deps (diff) | |
| download | portage-multirepo-91ce7faffeb61e66c3377b81d5fe3fca00151c3b.tar.gz portage-multirepo-91ce7faffeb61e66c3377b81d5fe3fca00151c3b.tar.bz2 portage-multirepo-91ce7faffeb61e66c3377b81d5fe3fca00151c3b.zip | |
Fix inconsistencies between the "clean" and "cleanrm" phases. (trunk r12126)
svn path=/main/branches/2.1.6/; revision=12129
| -rwxr-xr-x | bin/ebuild.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 72f1f5ac..87f94717 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 |