diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-09-06 13:35:21 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-09-06 13:35:21 -0700 |
| commit | eaf6feffad49a52f3d37eeb530b23b13e7f3e994 (patch) | |
| tree | b882148008eca1b3018f73fcf3184136cb20b1c0 /pym/_emerge/actions.py | |
| parent | dc8d70479dfb54a1f2561ba3fe82d7a62d97964f (diff) | |
| download | portage-eaf6feffad49a52f3d37eeb530b23b13e7f3e994.tar.gz portage-eaf6feffad49a52f3d37eeb530b23b13e7f3e994.tar.bz2 portage-eaf6feffad49a52f3d37eeb530b23b13e7f3e994.zip | |
Move the Scheduler mergelist constructor parameter to the graph_config
object.
Diffstat (limited to 'pym/_emerge/actions.py')
| -rw-r--r-- | pym/_emerge/actions.py | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 473f6fb7a..606d685ce 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -410,11 +410,10 @@ def action_build(settings, trees, mtimedb, if ("--resume" in myopts): favorites=mtimedb["resume"]["favorites"] - mymergelist = mydepgraph.altlist() - mydepgraph.break_refs(mymergelist) mergetask = Scheduler(settings, trees, mtimedb, myopts, - spinner, mymergelist, favorites, mydepgraph.schedulerGraph()) - del mydepgraph, mymergelist + spinner, favorites=favorites, + graph_config=mydepgraph.schedulerGraph()) + del mydepgraph clear_caches(trees) retval = mergetask.merge() @@ -427,12 +426,11 @@ def action_build(settings, trees, mtimedb, del mtimedb["resume"] mtimedb.commit() - pkglist = mydepgraph.altlist() mydepgraph.saveNomergeFavorites() - mydepgraph.break_refs(pkglist) mergetask = Scheduler(settings, trees, mtimedb, myopts, - spinner, pkglist, favorites, mydepgraph.schedulerGraph()) - del mydepgraph, pkglist + spinner, favorites=favorites, + graph_config=mydepgraph.schedulerGraph()) + del mydepgraph clear_caches(trees) retval = mergetask.merge() @@ -2460,7 +2458,7 @@ def action_uninstall(settings, trees, ldpath_mtimes, # redirection of ebuild phase output to logs as required for # options such as --quiet. sched = Scheduler(settings, trees, None, opts, - spinner, [], [], None) + spinner) sched._background = sched._background_mode() sched._status_display.quiet = True |