Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix erroneous result message for whipper drive analyze #409

Merged
merged 1 commit into from
Oct 21, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion whipper/program/cdparanoia.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')
_ABORTING_RE = re.compile(r'aborting test\.')


class AnalyzeTask(ctask.PopenTask):
Expand Down Expand Up @@ -604,7 +605,7 @@ def failed(self):
# whether it can defeat the audio cache
output = "".join(self._output)
m = _WARNING_RE.search(output)
if m:
if m or _ABORTING_RE.search(output):
self.defeatsCache = False
if self.cwd:
shutil.rmtree(self.cwd)