We need to be sure we clear out /var/log/portage/elog as well as /var/log/emerge...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1303 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index bce6946d09a1d77eceb450af6612523b992e9b0d..09e4fb44bfd9cc5a3cea962d3ddfc0713db05ee8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  14 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/stage1/stage1-chroot.sh, targets/stage2/stage2-chroot.sh,
+  targets/stage3/stage3-chroot.sh:
+  We need to be sure we clear out /var/log/portage/elog as well as
+  /var/log/emerge.log for stages 1 through 3.
+
   14 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
   modules/generic_stage_target.py,
   targets/livecd-stage2/livecd-stage2-controller.sh,

diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index 4464196f44b22e9eca846ea2971fa5ddb6f0cd6b..62fd52ba4726ec40a31c4ab104a446b3840066ef 100755 (executable)
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -45,6 +45,5 @@ USE="-* bindist build ${STAGE1_USE} ${HOSTUSE}" run_emerge "--noreplace --onesho
 rm -f /var/lib/portage/world
 touch /var/lib/portage/world
 
-rm -f /var/log/emerge.log
-rm -f /etc/xml/catalog
+rm -f /var/log/emerge.log /var/log/portage/elog/* /etc/xml/catalog
 rm -rf /var/tmp/*

diff --git a/targets/stage2/stage2-chroot.sh b/targets/stage2/stage2-chroot.sh
index 002a60515955a8ad05d1466076c14f4f1aade045..ec9016cc729acd29f9ee92614d107b33104c00cd 100755 (executable)
--- a/targets/stage2/stage2-chroot.sh
+++ b/targets/stage2/stage2-chroot.sh
@@ -24,3 +24,4 @@ fi
 ## START BUILD
 /usr/portage/scripts/bootstrap.sh ${bootstrap_opts} || exit 1
 
+rm -f /var/log/emerge.log /var/log/portage/elog/*

diff --git a/targets/stage3/stage3-chroot.sh b/targets/stage3/stage3-chroot.sh
index a1e65ea01a1e585c2ef3e45587b61c9214ca450d..7e1665ecdf497ec82adfe4373346743846094373 100755 (executable)
--- a/targets/stage3/stage3-chroot.sh
+++ b/targets/stage3/stage3-chroot.sh
@@ -16,3 +16,5 @@ run_emerge "-e system"
 
 rm -f /var/lib/portage/world
 touch /var/lib/portage/world
+
+rm -f /var/log/emerge.log /var/log/portage/elog/*