From 67ea2206047d87e04dec899b54238ecae49be2cc Mon Sep 17 00:00:00 2001
From: JoeLametta <JoeLametta@users.noreply.github.com>
Date: Mon, 5 Sep 2016 17:14:11 +0200
Subject: [PATCH] Make pycdio dependency not overridable

---
 README.md          |  2 +-
 morituri/rip/cd.py | 20 ++++----------------
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index 1489f6f..83f0b21 100755
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@ REQUIREMENTS
 - python musicbrainzngs, for metadata lookup
 - python-setuptools, for plugin support
 - python-cddb, for showing but not using disc info if not in MusicBrainz
-- pycdio, for drive identification (it can be overridden placing a blank file named `PYCDIO_IGNORE` into whipper's config path)
+- pycdio, for drive identification
   - Required for drive offset and caching behavior to be stored in the config file
 
 Additionally, if you're building from a git checkout:
diff --git a/morituri/rip/cd.py b/morituri/rip/cd.py
index e014f4a..317b928 100644
--- a/morituri/rip/cd.py
+++ b/morituri/rip/cd.py
@@ -30,7 +30,7 @@ import gobject
 gobject.threads_init()
 
 from morituri.common import logcommand, common, accurip, gstreamer
-from morituri.common import drive, program, task, directory
+from morituri.common import drive, program, task
 from morituri.result import result
 from morituri.program import cdrdao, cdparanoia
 from morituri.rip import common as rcommon
@@ -161,27 +161,15 @@ class _CD(logcommand.LogCommand):
         self.program.result.title = self.program.metadata \
             and self.program.metadata.title \
             or 'Unknown Title'
-        # cdio is optional for now
         try:
             import cdio
             _, self.program.result.vendor, self.program.result.model, \
                 self.program.result.release = \
                 cdio.Device(self.device).get_hwinfo()
         except ImportError:
-            d = directory.Directory()
-            path = os.path.dirname(d.getConfig())
-            fullPath = os.path.join(path, 'PYCDIO_IGNORE')
-            if os.path.isfile(fullPath):
-                self.stdout.write(
-                    'WARNING: pycdio not installed, cannot identify drive '
-                    '(hard dependency overridden)\n')
-                self.program.result.vendor = 'Unknown'
-                self.program.result.model = 'Unknown'
-                self.program.result.release = 'Unknown'
-            else:
-                raise ImportError("Pycdio module import failed.\n"
-                                  "This is a hard dependency: if not "
-                                  "available please install it")
+            raise ImportError("Pycdio module import failed.\n"
+                              "This is a hard dependency: if not "
+                              "available please install it")
 
         self.doCommand()