From 941db663982c7022e8d638808e646398c71e57f3 Mon Sep 17 00:00:00 2001
From: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date: Fri, 18 Jun 2010 22:28:13 +0000
Subject: [PATCH] 	* morituri/program/cdparanoia.py: 	  Warn about
 missing cdparanoia too.

---
 ChangeLog                      |  5 +++++
 morituri/program/cdparanoia.py | 15 +++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 153d0a7..fa6c1e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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:
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)