| 1 |
Author: zmedico |
| 2 |
Date: 2008-03-28 13:08:45 +0000 (Fri, 28 Mar 2008) |
| 3 |
New Revision: 9579 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/ebuild.sh |
| 7 |
Log: |
| 8 |
Make dyn_clean() consistent wrt removal of ${PORTAGE_BUILDDIR}/image and |
| 9 |
${PORTAGE_BUILDDIR}/.installed since otherwise with FEATURES=keepwork |
| 10 |
dyn_install() will not call src_install() as necessary to repopulate |
| 11 |
${PORTAGE_BUILDDIR}/image (resulting in install_qa_check failure due |
| 12 |
to absence of ${PORTAGE_BUILDDIR}/image). (trunk r9527) |
| 13 |
|
| 14 |
|
| 15 |
Modified: main/branches/2.1.2/bin/ebuild.sh |
| 16 |
=================================================================== |
| 17 |
--- main/branches/2.1.2/bin/ebuild.sh 2008-03-28 13:07:53 UTC (rev 9578) |
| 18 |
+++ main/branches/2.1.2/bin/ebuild.sh 2008-03-28 13:08:45 UTC (rev 9579) |
| 19 |
@@ -689,6 +689,7 @@ |
| 20 |
fi |
| 21 |
|
| 22 |
rm -rf "${PORTAGE_BUILDDIR}/image" "${PORTAGE_BUILDDIR}/homedir" |
| 23 |
+ rm -f "${PORTAGE_BUILDDIR}/.installed" |
| 24 |
|
| 25 |
if ! hasq keeptemp $FEATURES && ! hasq keepwork $FEATURES ; then |
| 26 |
rm -rf "${T}" |
| 27 |
@@ -700,7 +701,6 @@ |
| 28 |
rm -rf "${PORTAGE_BUILDDIR}/.unpacked" |
| 29 |
rm -rf "${PORTAGE_BUILDDIR}/.compiled" |
| 30 |
rm -rf "${PORTAGE_BUILDDIR}/.tested" |
| 31 |
- rm -rf "${PORTAGE_BUILDDIR}/.installed" |
| 32 |
rm -rf "${PORTAGE_BUILDDIR}/.packaged" |
| 33 |
rm -rf "${PORTAGE_BUILDDIR}/build-info" |
| 34 |
rm -rf "${WORKDIR}" |
| 35 |
|
| 36 |
-- |
| 37 |
gentoo-commits@l.g.o mailing list |
Archives