Expanded syslist during the unmerge phase so that all packages listed in

system are correctly checked and warned against.  #83670

2 files changed, 14 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 479d5d9..d3a0c9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,17 @@
 # ChangeLog for Portage; the Gentoo Linux ports system 
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Id: ChangeLog,v 1.796.2.76 2005/03/01 01:17:54 carpaski Exp $
+# $Id: ChangeLog,v 1.796.2.77 2005/03/01 15:00:41 jstubbs Exp $
 
   MAJOR CHANGES in 2.0.51:
     1. /var/cache/edb/virtuals is no longer used at all. It's calculated now.
     2. /var/cache/edb/world is now /var/lib/portage/world.
     3. /etc/portage/profile/virtuals is _USER_ configs only.
 
-*portage-2.0.51.18 (26 Feb 2004): Maintainence Release + BSD chflags
+  01 Mar 2005; Jason Stubbs <jstubbs@gentoo.org> bin/emerge: Expanded
+  syslist during the unmerge phase so that all packages listed in system
+  are correctly checked and warned against.  #83670
+
+*portage-2.0.51.18 (28 Feb 2004): Maintainence Release + BSD chflags
   
   28 Feb 2005; Jason Stubbs <jstubbs@gentoo.org> pym/portage.py: Added a
   -* to updated FEATURES before saving back to the env.  #79566
diff --git a/bin/emerge b/bin/emerge
index 9d1f04a..903999e 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1,7 +1,7 @@
 #!/usr/bin/python -O
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/emerge,v 1.345.2.17 2005/02/15 23:27:44 jstubbs Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/emerge,v 1.345.2.18 2005/03/01 15:00:41 jstubbs Exp $
 
 import os,sys
 os.environ["PORTAGE_CALLER"]="emerge"
@@ -1976,7 +1976,13 @@ def unmerge(unmerge_action, unmerge_files):
 	candidate_catpkgs=[]
 	global_unmerge=0
 	
-	syslist = getlist("system")
+	realsyslist = getlist("system")
+	syslist = []
+	for x in realsyslist:
+		mycp = portage.dep_getkey(x)
+		if mycp in portage.settings.virtuals:
+			syslist.extend(portage.settings.virtuals[mycp])
+		syslist.append(mycp)
 	
 	global myopts	
 	mysettings = portage.config(clone=portage.settings)