[SCM] morituri/master: * morituri/common/task.py: Show us when we stop twice. * morituri/common/gstreamer.py: Stop on Exceptions.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4c81edf91283e756d5d03c0a86d01abbcba9492f
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Tue May 24 15:16:39 2011 +0000

    	* morituri/common/task.py:
    	  Show us when we stop twice.
    	* morituri/common/gstreamer.py:
    	  Stop on Exceptions.

diff --git a/ChangeLog b/ChangeLog
index 7e02960..d0579d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2011-05-24  Thomas Vander Stichele  <thomas at apestaart dot org>
 
+	* morituri/common/task.py:
+	  Show us when we stop twice.
+	* morituri/common/gstreamer.py:
+	  Stop on Exceptions.
+
+2011-05-24  Thomas Vander Stichele  <thomas at apestaart dot org>
+
 	* morituri/common/common.py:
 	  Add an EmptyError.
 	* morituri/common/checksum.py:
diff --git a/morituri/common/gstreamer.py b/morituri/common/gstreamer.py
index 34d9d64..2051c04 100644
--- a/morituri/common/gstreamer.py
+++ b/morituri/common/gstreamer.py
@@ -97,6 +97,7 @@ class GstPipelineTask(task.Task):
         def playLater():
             if self.exception:
                 self.debug('playLater: exception was raised, not playing')
+                self.stop()
                 return False
 
             self.debug('setting pipeline to PLAYING')
diff --git a/morituri/common/task.py b/morituri/common/task.py
index 658eb34..e5f099d 100644
--- a/morituri/common/task.py
+++ b/morituri/common/task.py
@@ -98,6 +98,9 @@ class Task(object, log.Loggable):
         """
         self.debug('stopping')
         self.running = False
+        if not self.runner:
+            print 'ERROR: stopping task which is already stopped'
+            import traceback; traceback.print_stack()
         self.runner = None
         self._notifyListeners('stopped')
 

-- 
morituri packaging