[SCM] morituri/master: * morituri/program/cdparanoia.py: Warn about missing cdparanoia too.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 941db663982c7022e8d638808e646398c71e57f3
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Fri Jun 18 22:28:13 2010 +0000

    	* morituri/program/cdparanoia.py:
    	  Warn about missing cdparanoia too.

diff --git a/ChangeLog b/ChangeLog
index 153d0a7..fa6c1e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-06-19  Thomas Vander Stichele  <thomas at apestaart dot org>
 
+	* morituri/program/cdparanoia.py:
+	  Warn about missing cdparanoia too.
+
+2010-06-19  Thomas Vander Stichele  <thomas at apestaart dot org>
+
 	* morituri/common/common.py:
 	  Add MissingDependencyException.
 	* morituri/program/cdrdao.py:
diff --git a/morituri/program/cdparanoia.py b/morituri/program/cdparanoia.py
index 0870788..2eb1236 100644
--- a/morituri/program/cdparanoia.py
+++ b/morituri/program/cdparanoia.py
@@ -243,10 +243,17 @@ class ReadTrackTask(task.Task):
                 stopTrack, common.framesToHMSF(stopOffset)),
             self.path])
         self.debug('Running %s' % (" ".join(argv), ))
-        self._popen = asyncsub.Popen(argv,
-            bufsize=bufsize,
-            stdin=subprocess.PIPE, stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE, close_fds=True)
+        try:
+            self._popen = asyncsub.Popen(argv,
+                bufsize=bufsize,
+                stdin=subprocess.PIPE, stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE, close_fds=True)
+        except OSError, e:
+            import errno
+            if e.errno == errno.ENOENT:
+                raise common.MissingDependencyException('cdparanoia')
+
+            raise
 
         self.runner.schedule(1.0, self._read, runner)
 

-- 
morituri packaging