From: Zac Medico Date: Mon, 30 Jun 2008 02:34:16 +0000 (-0000) Subject: Rename the MergeTask class to Scheduler. X-Git-Tag: v2.2_rc2~272 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d7b88e3f8f60b30b54b5033f1391d1739175e6e3;p=portage.git Rename the MergeTask class to Scheduler. svn path=/main/trunk/; revision=10853 --- diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 8115bdf52..d2f34d8b9 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -6320,7 +6320,7 @@ class PackageCounters(object): (self.blocks - self.blocks_satisfied)) return "".join(myoutput) -class MergeTask(object): +class Scheduler(object): _opts_ignore_blockers = \ frozenset(["--buildpkgonly", @@ -9389,7 +9389,7 @@ def action_build(settings, trees, mtimedb, mymergelist = mydepgraph.altlist() mydepgraph.break_refs(mymergelist) mydepgraph.break_refs(mydepgraph.digraph.order) - mergetask = MergeTask(settings, trees, mtimedb, myopts, + mergetask = Scheduler(settings, trees, mtimedb, myopts, spinner, mymergelist, favorites, mydepgraph.digraph) del mydepgraph clear_caches(trees) @@ -9436,7 +9436,7 @@ def action_build(settings, trees, mtimedb, mydepgraph.saveNomergeFavorites() mydepgraph.break_refs(pkglist) mydepgraph.break_refs(mydepgraph.digraph.order) - mergetask = MergeTask(settings, trees, mtimedb, myopts, + mergetask = Scheduler(settings, trees, mtimedb, myopts, spinner, pkglist, favorites, mydepgraph.digraph) del mydepgraph clear_caches(trees)