[gentoo-commits] portage r10820 - main/trunk/pym/_emerge

[gentoo-commits] portage r10820 - main/trunk/pym/_emerge

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-06-27 22:53:08 +0000 (Fri, 27 Jun 2008)
New Revision: 10820

Modified:
   main/trunk/pym/_emerge/__init__.py
Log:
Pass the digraph into the MergeTask constructor. It's currently unused
but it will be useful for parallel scheduling.


Modified: main/trunk/pym/_emerge/__init__.py
===================================================================
--- main/trunk/pym/_emerge/__init__.py	2008-06-27 22:44:01 UTC (rev 10819)
+++ main/trunk/pym/_emerge/__init__.py	2008-06-27 22:53:08 UTC (rev 10820)
@@ -5874,7 +5874,7 @@
 		"--nodeps", "--pretend"])
 
 	def __init__(self, settings, trees, mtimedb, myopts,
-		spinner, mergelist, favorites):
+		spinner, mergelist, favorites, digraph):
 		self.settings = settings
 		self.target_root = settings["ROOT"]
 		self.trees = trees
@@ -8909,11 +8909,11 @@
 				time.sleep(3) # allow the parent to have first fetch
 			mymergelist = mydepgraph.altlist()
 			mydepgraph.break_refs(mymergelist)
+			mergetask = MergeTask(settings, trees, mtimedb, myopts,
+				spinner, mymergelist, favorites, mydepgraph.digraph)
 			del mydepgraph
 			clear_caches(trees)
 
-			mergetask = MergeTask(settings, trees, mtimedb, myopts,
-				spinner, mymergelist, favorites)
 			retval = mergetask.merge()
 			merge_count = mergetask.curval
 		else:
@@ -8955,11 +8955,11 @@
 			pkglist = mydepgraph.altlist()
 			mydepgraph.saveNomergeFavorites()
 			mydepgraph.break_refs(pkglist)
+			mergetask = MergeTask(settings, trees, mtimedb, myopts,
+				spinner, pkglist, favorites, mydepgraph.digraph)
 			del mydepgraph
 			clear_caches(trees)
 
-			mergetask = MergeTask(settings, trees, mtimedb, myopts,
-				spinner, pkglist, favorites)
 			retval = mergetask.merge()
 			merge_count = mergetask.curval
 

-- 
gentoo-commits@lists.gentoo.org mailing list