From 28926e3fba5b88886631e73a472476558b0c6998 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Tue, 30 Jul 2013 10:59:28 +0200 Subject: [PATCH] handle not having cdparanoia on rip offset find --- morituri/rip/offset.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/morituri/rip/offset.py b/morituri/rip/offset.py index 646d46e..965c9f0 100644 --- a/morituri/rip/offset.py +++ b/morituri/rip/offset.py @@ -26,7 +26,7 @@ import tempfile import gobject gobject.threads_init() -from morituri.common import logcommand, accurip, drive, program +from morituri.common import logcommand, accurip, drive, program, common from morituri.common import task as ctask from morituri.program import cdrdao, cdparanoia @@ -151,11 +151,18 @@ CD in the AccurateRip database.""" try: archecksum = self._arcs(runner, table, 1, offset) except task.TaskException, e: + + # let MissingDependency fall through + if isinstance(e.exception, + common.MissingDependencyException): + raise e + if isinstance(e.exception, cdparanoia.FileSizeError): self.stdout.write( 'WARNING: cannot rip with offset %d...\n' % offset) continue - self.warning("Unknown exception for offset %d: %r" % ( + + self.warning("Unknown task exception for offset %d: %r" % ( offset, e)) self.stdout.write( 'WARNING: cannot rip with offset %d...\n' % offset)