Only run depclean for stage3/system

diff --git a/ChangeLog b/ChangeLog
index 877a23d0d46b2fa7b61d4a3adc5ea0c12abe7554..5d8c285201337272b9e521b2a2535254976f0072 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  29 Dec 2009; Andrew Gaffney <agaffney@gentoo.org>
+  targets/support/chroot-functions.sh:
+  Only run depclean for stage3/system
+
   28 Dec 2009; Andrew Gaffney <agaffney@gentoo.org>
   targets/support/chroot-functions.sh:
   Run depclean at the end of stage generation (for Gentoo bug #295132)

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 7136083c87f566f436d3899952b1e517c5460299..555c99f38727613430cbf27e14a2abe49daf2aef 100644 (file)
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -200,20 +200,20 @@ cleanup_stages() {
                cleanup_icecream
        fi
        case ${clst_target} in
-               stage1|stage2|stage3)
-                       rm -f /var/lib/portage/world
-                       touch /var/lib/portage/world
+               stage3|system)
+                       run_merge --depclean --with-bdeps=n
                        ;;
                *)
-                       echo "Skipping removal of world file for ${clst_target}"
+                       echo "Skipping depclean operation for ${clst_target}"
                        ;;
        esac
        case ${clst_target} in
-               stage1|stage2|stage3|stage4|system)
-                       run_merge --depclean --with-bdeps=n
+               stage1|stage2|stage3)
+                       rm -f /var/lib/portage/world
+                       touch /var/lib/portage/world
                        ;;
                *)
-                       echo "Skipping depclean operation for ${clst_target}"
+                       echo "Skipping removal of world file for ${clst_target}"
                        ;;
        esac