[SCM] morituri/master: * morituri/extern/task/task.py: Also handle error() log calls.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c8e5545776a3a0b3ee6b793e89796b210964a12c
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Sun Aug 7 18:20:21 2011 +0000

    	* morituri/extern/task/task.py:
    	  Also handle error() log calls.

diff --git a/ChangeLog b/ChangeLog
index 0a56e26..809da0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2011-08-07  Thomas Vander Stichele  <thomas at apestaart dot org>
 
+	* morituri/extern/task/task.py:
+	  Also handle error() log calls.
+
+2011-08-07  Thomas Vander Stichele  <thomas at apestaart dot org>
+
 	* morituri/program/cdparanoia.py:
 	  Make sure exceptions don't prevent the task from chaining up
 	  to the parent stop() implementation, giving the runner a chance
diff --git a/morituri/extern/task/task.py b/morituri/extern/task/task.py
index 21fcbe5..62a7a24 100644
--- a/morituri/extern/task/task.py
+++ b/morituri/extern/task/task.py
@@ -24,8 +24,6 @@ import sys
 
 import gobject
 
-from morituri.common import log
-
 class TaskException(Exception):
     """
     I wrap an exception that happened during task execution.
@@ -80,6 +78,9 @@ class Task(object):
     def log(self, message, *args):
         pass
 
+    def error(self, message, *args):
+        pass
+
     ### subclass methods
     def start(self, runner):
         """
@@ -106,6 +107,8 @@ class Task(object):
         Also resets the runner on the task.
 
         Subclasses should chain up to me at the end.
+        It is important that they do so in all cases, even when
+        they ran into an exception of their own.
 
         Listeners will get notified that the task is stopped,
         whether successfully or with an exception.

-- 
morituri packaging