diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-03-26 00:06:01 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-03-26 00:06:01 -0700 |
| commit | dc6a4c122e827baf28729caf2dbb32576072d88f (patch) | |
| tree | b17c8a93f246b70faf58cbcbc49ecef7b0e8a05e /pym/_emerge/PackageMerge.py | |
| parent | 2e6fe9eb779b94d1f00d9ebdbdf76b3f026ebcd2 (diff) | |
| download | portage-dc6a4c122e827baf28729caf2dbb32576072d88f.tar.gz portage-dc6a4c122e827baf28729caf2dbb32576072d88f.tar.bz2 portage-dc6a4c122e827baf28729caf2dbb32576072d88f.zip | |
Reoranize PackageMerge/MergeListItem interaction.
Diffstat (limited to 'pym/_emerge/PackageMerge.py')
| -rw-r--r-- | pym/_emerge/PackageMerge.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/pym/_emerge/PackageMerge.py b/pym/_emerge/PackageMerge.py index 832eac03b..f8fa04a38 100644 --- a/pym/_emerge/PackageMerge.py +++ b/pym/_emerge/PackageMerge.py @@ -1,13 +1,14 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from _emerge.AsynchronousTask import AsynchronousTask +from _emerge.CompositeTask import CompositeTask from portage.output import colorize -class PackageMerge(AsynchronousTask): +class PackageMerge(CompositeTask): __slots__ = ("merge",) def _start(self): + self.scheduler = self.merge.scheduler pkg = self.merge.pkg pkg_count = self.merge.pkg_count @@ -35,8 +36,5 @@ class PackageMerge(AsynchronousTask): not self.merge.build_opts.buildpkgonly: self.merge.statusMessage(msg) - self.merge.merge(self.exit_handler) - - def exit_handler(self, task): - self.returncode = task.returncode - self.wait() + task = self.merge.create_install_task() + self._start_task(task, self._default_final_exit) |