diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-03-28 05:03:55 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-03-28 05:03:55 +0000 |
| commit | eb198446fc0952c802e22f1c1c086fe08fd1e8e0 (patch) | |
| tree | 384c1131b90e0a8336b6678cc9b187baa51d080c | |
| parent | 6d068a8c3f86ac1550be649f6f958adeff8e3f23 (diff) | |
| download | portage-eb198446fc0952c802e22f1c1c086fe08fd1e8e0.tar.gz portage-eb198446fc0952c802e22f1c1c086fe08fd1e8e0.tar.bz2 portage-eb198446fc0952c802e22f1c1c086fe08fd1e8e0.zip | |
Make dyn_clean() consistent wrt removal of ${PORTAGE_BUILDDIR}/image and
${PORTAGE_BUILDDIR}/.installed since otherwise with FEATURES=keepwork
dyn_install() will not call src_install() as necessary to repopulate
${PORTAGE_BUILDDIR}/image (resulting in install_qa_check failure due
to absence of ${PORTAGE_BUILDDIR}/image).
svn path=/main/trunk/; revision=9527
| -rwxr-xr-x | bin/ebuild.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 33c6d12c3..8f22fcab3 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -689,6 +689,7 @@ dyn_clean() { fi rm -rf "${PORTAGE_BUILDDIR}/image" "${PORTAGE_BUILDDIR}/homedir" + rm -f "${PORTAGE_BUILDDIR}/.installed" if ! hasq keeptemp $FEATURES && ! hasq keepwork $FEATURES ; then rm -rf "${T}" @@ -700,7 +701,6 @@ dyn_clean() { rm -rf "${PORTAGE_BUILDDIR}/.unpacked" rm -rf "${PORTAGE_BUILDDIR}/.compiled" rm -rf "${PORTAGE_BUILDDIR}/.tested" - rm -rf "${PORTAGE_BUILDDIR}/.installed" rm -rf "${PORTAGE_BUILDDIR}/.packaged" rm -rf "${PORTAGE_BUILDDIR}/build-info" rm -rf "${WORKDIR}" |