diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-06-27 22:53:08 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-06-27 22:53:08 +0000 |
| commit | 2114abe5d60fe141fcde232304c52ba98e2b84eb (patch) | |
| tree | 29b1426ce5b29d3b740d65c9654edbcd9715ccc4 | |
| parent | 3124b85ff7ef410758572e9a3a19f858e191c72f (diff) | |
| download | portage-2114abe5d60fe141fcde232304c52ba98e2b84eb.tar.gz portage-2114abe5d60fe141fcde232304c52ba98e2b84eb.tar.bz2 portage-2114abe5d60fe141fcde232304c52ba98e2b84eb.zip | |
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
| -rw-r--r-- | pym/_emerge/__init__.py | 10 |
1 files changed, 5 insertions, 5 deletions
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 |