diff --git a/whipper/program/cdparanoia.py b/whipper/program/cdparanoia.py index 254e099..465ffd1 100644 --- a/whipper/program/cdparanoia.py +++ b/whipper/program/cdparanoia.py @@ -598,10 +598,7 @@ class AnalyzeTask(ctask.PopenTask): shutil.rmtree(self.cwd) output = "".join(self._output) m = _OK_RE.search(output) - if m: - self.defeatsCache = True - else: - self.defeatsCache = False + self.defeatsCache = bool(m) def failed(self): # cdparanoia exits with return code 1 if it can't determine diff --git a/whipper/program/cdrdao.py b/whipper/program/cdrdao.py index d76882a..8bfad7f 100644 --- a/whipper/program/cdrdao.py +++ b/whipper/program/cdrdao.py @@ -168,10 +168,7 @@ def DetectCdr(device): cmd = [CDRDAO, 'disk-info', '-v1', '--device', device] logger.debug("executing %r", cmd) p = Popen(cmd, stdout=PIPE, stderr=PIPE) - if 'CD-R medium : n/a' in p.stdout.read(): - return False - else: - return True + return 'CD-R medium : n/a' not in p.stdout.read() def version():