deflake, remove morituri hack, more error handling

whipper/command/cd.py

@@ -22,14 +22,12 @@ import argparse
 import cdio
 import os
 import glob
-import urllib2
-import socket
 import sys
 import logging
 import gobject
 from whipper.command.basecommand import BaseCommand
 from whipper.common import (
-    accurip, common, config, drive, program, task
+    accurip, config, drive, program, task
 )
 from whipper.program import cdrdao, cdparanoia, utils
 from whipper.result import result
@@ -145,16 +143,6 @@ class _CD(BaseCommand):
                             "--cdr not passed")
             return -1
 
-        # FIXME ?????
-        # Hackish fix for broken commit
-        offset = 0
-        info = drive.getDeviceInfo(self.device)
-        if info:
-            try:
-                offset = self.config.getReadOffset(*info)
-            except KeyError:
-                pass
-
         # now, read the complete index table, which is slower
         self.itable = self.program.getTable(self.runner,
                                             self.ittoc.getCDDBDiscId(),
@@ -345,8 +333,11 @@ Log files will log the path to tracks relative to this directory.
         if os.path.exists(dirname):
             logs = glob.glob(os.path.join(dirname, '*.log'))
             if logs:
-                bye("output directory %s is a finished rip" %
-                    dirname.encode('utf-8'))
+                msg = ("output directory %s is a finished rip" %
+                       dirname.encode('utf-8'))
+                logger.critical(msg)
+                raise RuntimeError(msg)
+                exit
             else:
                 sys.stdout.write("output directory %s already exists\n" %
                                  dirname.encode('utf-8'))

whipper/command/main.py

@@ -36,8 +36,13 @@ def main():
                 cmd.options.eject in ('failure', 'always')):
             eject_device(e.device)
         return 255
+    except RuntimeError, e:
+        print(e)
+        return 1
+    except KeyboardInterrupt:
+        return 2
     except ImportError, e:
-        raise ImportError(e)
+        raise
     except task.TaskException, e:
         if isinstance(e.exception, ImportError):
             raise ImportError(e.exception)

whipper/command/offset.py

@@ -28,7 +28,6 @@ from whipper.command.basecommand import BaseCommand
 from whipper.common import accurip, common, config, drive
 from whipper.common import task as ctask
 from whipper.program import arc, cdrdao, cdparanoia, utils
-from whipper.common import checksum
 from whipper.extern.task import task
 
 gobject.threads_init()