Fixed emerge to always add packages to world unless --oneshot is specified.

2 files changed, 7 insertions, 20 deletions

diff --git a/ChangeLog b/ChangeLog
index cb0425c..bfb900f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,15 @@
 # ChangeLog for Portage; the Gentoo Linux ports system 
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Id: ChangeLog,v 1.796.2.88 2005/04/12 12:23:41 jstubbs Exp $
+# $Id: ChangeLog,v 1.796.2.89 2005/04/12 13:29:35 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.
 
+  12 Apr 2005; Jason Stubbs <jstubbs@gentoo.org> bin/emerge: Fixed emerge to
+  always add packages to world unless --oneshot is specified.
+
   12 Apr 2005; Jason Stubbs <jstubbs@gentoo.org> bin/dispatch-conf:
   Replaced shutil.movefile() calls for python-2.2 compatibility.
 
diff --git a/bin/emerge b/bin/emerge
index d21ba96..5202803 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.20 2005/04/03 07:00:30 jstubbs Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/emerge,v 1.345.2.21 2005/04/12 13:29:35 jstubbs Exp $
 
 import os,sys
 os.environ["PORTAGE_CALLER"]="emerge"
@@ -1738,25 +1738,10 @@ class depgraph:
 				del portage.mtimedb["resume"]["mergelist"][0]
 				del mymergelist[0]
 		else:
-			myfavs=portage.grabfile(portage.root+portage.WORLD_FILE)
-			myfavdict=genericdict(myfavs)
 			for x in range(len(mylist)):
 				if mylist[x][3]!="nomerge":
 					# Add to the mergelist
 					mymergelist.append(mylist[x])
-				else:
-					myfavkey=portage.cpv_getkey(mylist[x][2])
-					if "--onlydeps" in myopts:
-						continue
-					# Add to the world file. Since we won't be able to later.
-					if (not "--fetchonly" in myopts) and (myfavkey in favorites):
-						#don't record if already in system profile or already recorded
-						if (not mysysdict.has_key(myfavkey)) and (not myfavdict.has_key(myfavkey)):
-							#we don't have a favorites entry for this package yet; add one
-							myfavdict[myfavkey]=myfavkey
-							print ">>> Recording",myfavkey,"in \"world\" favorites file..."
-			if not "--fetchonly" in myopts:
-				portage.writedict(myfavdict,portage.root+portage.WORLD_FILE,writekey=0)
 
 			portage.mtimedb["resume"]["mergelist"]=mymergelist[:]
 
@@ -1877,13 +1862,12 @@ class depgraph:
 			if "--buildpkgonly" not in myopts:
 				portage.db[x[1]]["vartree"].inject(x[2])
 				myfavkey=portage.cpv_getkey(x[2])
-				if (not "--fetchonly" in myopts) and (not "--fetch-all-uri" in myopts) and (myfavkey in favorites):
+				if "--fetchonly" not in myopts and "--fetch-all-uri" not in myopts and myfavkey in favorites:
 					myfavs=portage.grabfile(myroot+portage.WORLD_FILE)
 					myfavdict=genericdict(myfavs)
 					mysysdict=genericdict(syslist)
 					#don't record if already in system profile or already recorded
-					if ("--update" not in myopts or not portage.db[portage.root]["vartree"].dbapi.match(myfavkey)) and \
-					    (not mysysdict.has_key(myfavkey)) and (not myfavdict.has_key(myfavkey)):
+					if (not mysysdict.has_key(myfavkey)) and (not myfavdict.has_key(myfavkey)):
 						#we don't have a favorites entry for this package yet; add one
 						myfavdict[myfavkey]=myfavkey
 						print ">>> Recording",myfavkey,"in \"world\" favorites file..."