Skip to content

Commit

Permalink
Revert "Address issue #23"
Browse files Browse the repository at this point in the history
This reverts commit 71422bd.
  • Loading branch information
JoeLametta committed Jul 24, 2016
1 parent b97e0a7 commit 578b657
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions morituri/rip/cd.py
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,11 @@ def do(self, args):
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()

Expand Down Expand Up @@ -271,13 +273,11 @@ def handleOptions(self, options):
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:
Expand Down

0 comments on commit 578b657

Please # to comment.