From: Andrew Gaffney <agaffney@gentoo.org>
Date: Tue, 29 Dec 2009 17:50:06 +0000 (-0600)
Subject: Only run depclean for stage3/system
X-Git-Tag: CATALYST-2.0.10~3^2~68
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=df8d560917f354a182cf9e8988baac1c895f69d6;p=catalyst.git

Only run depclean for stage3/system
---

diff --git a/ChangeLog b/ChangeLog
index 877a23d0..5d8c2852 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>
   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 7136083c..555c99f3 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)
+			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