1.1

Author: zmedico
Date: 2008-07-06 01:51:50 +0000 (Sun, 06 Jul 2008)
New Revision: 10951

Modified:
   main/trunk/pym/_emerge/__init__.py
Log:
Add CompositeTask._final_exit() method and use it to fix breakage from the
previous commit.


Modified: main/trunk/pym/_emerge/__init__.py
===================================================================
--- main/trunk/pym/_emerge/__init__.py	2008-07-06 01:24:29 UTC (rev 10950)
+++ main/trunk/pym/_emerge/__init__.py	2008-07-06 01:51:50 UTC (rev 10951)
@@ -1552,6 +1552,19 @@
 			self._current_task = None
 		return task.returncode
 
+	def _final_exit(self, task):
+		"""
+		Assumes that task is the final task of this composite task.
+		Calls _default_exit() and sets self.returncode to the task's
+		returncode and sets self._current_task to None.
+
+		Subclasses can use this as a generic final task exit callback.
+
+		"""
+		self._default_exit(task)
+		self._current_task = None
+		self.returncode = task.returncode
+
 class TaskSequence(CompositeTask):
 	"""
 	A collection of tasks that executes sequentially. Each task
@@ -1585,6 +1598,8 @@
 		if self._default_exit(task) == os.EX_OK and \
 			self._task_queue:
 			self._start_next_task()
+		else:
+			self._final_exit(task)
 
 class SubProcess(AsynchronousTask):
 	__slots__ = ("pid",)
@@ -2022,7 +2037,7 @@
 				pkg=pkg, phase=phase, scheduler=scheduler,
 				settings=settings, tree=tree))
 
-		ebuild_phases.addExitListener(self._default_exit)
+		ebuild_phases.addExitListener(self._final_exit)
 		self._current_task = ebuild_phases
 		ebuild_phases.start()
 

-- 
gentoo-commits@g.o mailing list