From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 27 Jun 2008 22:53:08 +0000 (-0000)
Subject: Pass the digraph into the MergeTask constructor. It's currently unused
X-Git-Tag: v2.2_rc2~305
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2114abe5d60fe141fcde232304c52ba98e2b84eb;p=portage.git

Pass the digraph into the MergeTask constructor. It's currently unused
but it will be useful for parallel scheduling.

svn path=/main/trunk/; revision=10820
---

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index bd579ce9b..6dc8d5abf 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -5874,7 +5874,7 @@ class MergeTask(object):
 		"--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 @@ def action_build(settings, trees, mtimedb,
 				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 @@ def action_build(settings, trees, mtimedb,
 			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