From 578b657b0c81210c0195ab16741d1155f6f12ef9 Mon Sep 17 00:00:00 2001 From: JoeLametta Date: Sun, 24 Jul 2016 22:47:04 +0200 Subject: [PATCH] Revert "Address issue #23" This reverts commit 71422bd96b0a94de514a7a66d9519b21361da9d1. --- morituri/rip/cd.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/morituri/rip/cd.py b/morituri/rip/cd.py index a72f755..b75894c 100644 --- a/morituri/rip/cd.py +++ b/morituri/rip/cd.py @@ -168,9 +168,11 @@ class _CD(logcommand.LogCommand): self.program.result.release = \ cdio.Device(self.device).get_hwinfo() except ImportError: - raise ImportError("Pycdio module import failed.\n" - "This is a hard dependency: if not available " - "please install it") + self.stdout.write( + 'WARNING: pycdio not installed, cannot identify drive\n') + self.program.result.vendor = 'Unknown' + self.program.result.model = 'Unknown' + self.program.result.release = 'Unknown' self.doCommand() @@ -271,13 +273,11 @@ Log files will log the path to tracks relative to this directory. pass if options.offset is None: - raise ValueError("Drive offset is unconfigured.\n" - "Please install pycdio and run 'rip offset " - "find' to detect your drive's offset or set it " - "manually in the configuration file. It can " - "also be specified at runtime using the " - "'--offset=value' argument") - + options.offset = 0 + self.stdout.write("""WARNING: using default offset %d. +Install pycdio and run 'rip offset find' to detect your drive's offset. +""" % + options.offset) if self.options.output_directory is None: self.options.output_directory = os.getcwd() else: