[SCM] morituri/master: only mark as a failure if we see an expected string

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a4361905557fce8e8d0e9acf3a8eb89a65a0aa8b
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Sun Feb 3 14:58:04 2013 +0100

    only mark as a failure if we see an expected string

diff --git a/morituri/program/cdparanoia.py b/morituri/program/cdparanoia.py
index 6ef58e3..affec85 100644
--- a/morituri/program/cdparanoia.py
+++ b/morituri/program/cdparanoia.py
@@ -566,6 +566,7 @@ def getCdParanoiaVersion():
 
 
 _OK_RE = re.compile(r'Drive tests OK with Paranoia.')
+_WARNING_RE = re.compile(r'WARNING! PARANOIA MAY NOT BE')
 
 
 class AnalyzeTask(ctask.PopenTask):
@@ -605,6 +606,9 @@ class AnalyzeTask(ctask.PopenTask):
     def failed(self):
         # cdparanoia exits with return code 1 if it can't determine
         # whether it can defeat the audio cache
-        self.defeatsCache = False
+        output = "".join(self._output)
+        m = _WARNING_RE.search(output)
+        if m:
+            self.defeatsCache = False
         if self.cwd:
             shutil.rmtree(self.cwd)

-- 
morituri packaging