From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 8 Jul 2008 17:44:53 +0000 (-0000)
Subject: Derive PackageMerge from AsynchronousTask instead of CompositeTask since
X-Git-Tag: v2.2_rc2~153
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ffa39d0638e12a4957014afdbdbb15967bf7e3b6;p=portage.git

Derive PackageMerge from AsynchronousTask instead of CompositeTask since
CompositeTask is designed for self._current_task to be set.

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

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index c5d6c402f..96902685d 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -2987,7 +2987,7 @@ class MergeListItem(CompositeTask):
 		retval = self._install_task.install()
 		return retval
 
-class PackageMerge(CompositeTask):
+class PackageMerge(AsynchronousTask):
 	"""
 	TODO: Implement asynchronous merge so that the scheduler can
 	run while a merge is executing.