benya/whipper-gui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #409 from whipper-team/bugfix/issue-361-drive-analysis-fails

Browse Source 
Fix erroneous result message for whipper drive analyze
This commit is contained in:
JoeLametta
2019-10-21 16:30:03 +02:00
committed by GitHub
parent 14fb96e87c 048a31e348
commit fe13affac2
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
whipper/program/cdparanoia.py
View File

@@ -566,6 +566,7 @@ def getCdParanoiaVersion():
_OK_RE = re.compile(r'Drive tests OK with Paranoia.') _OK_RE = re.compile(r'Drive tests OK with Paranoia.')
_WARNING_RE = re.compile(r'WARNING! PARANOIA MAY NOT BE') _WARNING_RE = re.compile(r'WARNING! PARANOIA MAY NOT BE')
_ABORTING_RE = re.compile(r'aborting test\.')
class AnalyzeTask(ctask.PopenTask): class AnalyzeTask(ctask.PopenTask):
@@ -604,7 +605,7 @@ class AnalyzeTask(ctask.PopenTask):
# whether it can defeat the audio cache # whether it can defeat the audio cache
output = "".join(self._output) output = "".join(self._output)
m = _WARNING_RE.search(output) m = _WARNING_RE.search(output)
if m: if m or _ABORTING_RE.search(output):
self.defeatsCache = False self.defeatsCache = False
if self.cwd: if self.cwd:
shutil.rmtree(self.cwd) shutil.rmtree(self.cwd)