Changeset 410

Timestamp:

19-06-10 00:02:53 (3 years ago)

Author:

thomas

Message:

• morituri/common/common.py: Add MissingDependencyException?.
• morituri/program/cdrdao.py:
• morituri/rip/main.py: Use it to warn about missing cdrdao.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• morituri/common/common.py (modified) (1 diff)
• morituri/program/cdrdao.py (modified) (1 diff)
• morituri/rip/main.py (modified) (2 diffs)

trunk/ChangeLog

@@ +1 @@
+2010-06-19  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+        * morituri/common/common.py:
+          Add MissingDependencyException.
+        * morituri/program/cdrdao.py:
+        * morituri/rip/main.py:
+          Use it to warn about missing cdrdao.
+
 2010-06-18  Thomas Vander Stichele  <thomas at apestaart dot org>
 

trunk/morituri/common/common.py

@@ -206 +206 @@
 
     return d1 == d2
+
+class MissingDependencyException(Exception):
+    dependency = None
+
+    def __init__(self, *args):
+        self.args = args
+        self.dependency = args[0]

trunk/morituri/program/cdrdao.py

@@ -251 +251 @@
 
         bufsize = 1024
-        self._popen = asyncsub.Popen(["cdrdao", ] + self.options,
-            bufsize=bufsize,
-            stdin=subprocess.PIPE, stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE, close_fds=True)
+        try:
+            self._popen = asyncsub.Popen(["cdrdao", ] + self.options,
+                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('cdrdao')
+
+            raise
+
         self.debug('Started cdrdao with pid %d and options %r',
             self._popen.pid, self.options)

trunk/morituri/rip/main.py

@@ -4 +4 @@
 import sys
 
-from morituri.common import log, logcommand
+from morituri.common import log, logcommand, common, task
 from morituri.rip import cd, offset, drive, image
 
@@ -19 +19 @@
         # deps.handleImportError(e)
         # ret = -1
+    except task.TaskException, e:
+        if isinstance(e.exception, common.MissingDependencyException):
+            sys.stderr.write('rip: error: missing dependency "%s"\n' %
+                e.exception.dependency)
+            return 255
+        raise
 
     if ret is None: