Removing loop for unmerge, as it didn't actually solve anything and the portage team...

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

diff --git a/ChangeLog b/ChangeLog
index 6808f538a6c0f81c4aebf040b59332f3f7ddb132..ef62c5791ef0e6f42e216ef207c99595e4fe7eee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.636 2006/06/21 22:11:54 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.637 2006/06/22 11:43:34 wolf31o2 Exp $
+
+  22 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/support/unmerge.sh:
+  Removing loop for unmerge, as it didn't actually solve anything and the
+  portage team has helped us out by reverting the behavior that caused this
+  change in the first place.
 
   21 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
   modules/netboot2_target.py, modules/stage1_target.py,

diff --git a/targets/support/unmerge.sh b/targets/support/unmerge.sh
index 9af378ad360b2accb689377ac74bcdb793326ed5..41dcc68c331260303b598c6c7142e4c0551bc277 100644 (file)
--- a/targets/support/unmerge.sh
+++ b/targets/support/unmerge.sh
@@ -1,19 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/unmerge.sh,v 1.4 2006/06/20 19:32:31 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/unmerge.sh,v 1.5 2006/06/22 11:43:34 wolf31o2 Exp $
 
 
 source /tmp/chroot-functions.sh
 
 update_env_settings
 
-# Add a fun loop, so we have to init portage every single time, causing it to
-# run much slower to work around unexpected changes in portage 2.1 with respect
-# to how it processes unmerge for non-existent packages.  A word to other
-# developers out there.  Don't change behavior that people rely on without
-# documenting the change.  It really sucks when you do.
-for package in ${clst_packages}
-do
-       run_emerge -C "${package}"
-done
+run_emerge -C ${clst_packages}
+
 exit 0