From 8ceac5496e1bdb66e623c7c27a99ae4e8986f22d Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Tue, 20 Jun 2006 19:32:31 +0000 Subject: [PATCH] Change our unmerge from being a single unmerge to a loop, to work around an unexpected change in portage 2.1's unmerge processing. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1150 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 7 ++++++- targets/support/unmerge.sh | 12 ++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 505b4b48..4fc7fe7a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.634 2006/06/19 19:05:02 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.635 2006/06/20 19:32:31 wolf31o2 Exp $ + + 20 Jun 2006; Chris Gianelloni + targets/support/unmerge.sh: + Change our unmerge from being a single unmerge to a loop, to work around an + unexpected change in portage 2.1's unmerge processing. 19 Jun 2006; Chris Gianelloni targets/support/bootloader-setup.sh: diff --git a/targets/support/unmerge.sh b/targets/support/unmerge.sh index 345c551a..9af378ad 100644 --- a/targets/support/unmerge.sh +++ b/targets/support/unmerge.sh @@ -1,11 +1,19 @@ # 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.3 2005/12/19 16:52:01 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/unmerge.sh,v 1.4 2006/06/20 19:32:31 wolf31o2 Exp $ source /tmp/chroot-functions.sh update_env_settings -run_emerge -C "${clst_packages}" +# 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 exit 0 -- 2.26.2