From: Andrew Gaffney <agaffney@gentoo.org>
Date: Tue, 29 Dec 2009 17:49:21 +0000 (-0600)
Subject: Only run depclean for stage3/system
X-Git-Tag: CATALYST_2_0_6_916~21
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=286c54419a1406c04f83b97113d5e07cf407396a;p=catalyst.git

Only run depclean for stage3/system
---

diff --git a/ChangeLog b/ChangeLog
index 8693ed9a..f8ff9753 100644
--- 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> catalyst:
   This is catalyst 2.0.6.906
 
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 1c227aa4..003e38c5 100644
--- 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|system)
+			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