diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-03-28 13:08:45 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-03-28 13:08:45 +0000 |
| commit | 659a580a577ade1d8a381d465e51d593d2b0ef1a (patch) | |
| tree | f8a25f2304405c88ec39a7dc69b99337987caad8 /bin/ebuild.sh | |
| parent | 9b6ab32fd773f59917688b75b2ea5da5db626602 (diff) | |
| download | portage-659a580a577ade1d8a381d465e51d593d2b0ef1a.tar.gz portage-659a580a577ade1d8a381d465e51d593d2b0ef1a.tar.bz2 portage-659a580a577ade1d8a381d465e51d593d2b0ef1a.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). (trunk r9527)
svn path=/main/branches/2.1.2/; revision=9579
Diffstat (limited to 'bin/ebuild.sh')
| -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 fb2e2a3a5..b9abc4790 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}" |