From f6a25897412cd9849aee037891d60250d2212beb Mon Sep 17 00:00:00 2001 From: Chronial Date: Mon, 27 Apr 2015 12:01:04 +0200 Subject: [PATCH] Fix compatibility with Snapraid 8.0 --- snapraid-runner.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/snapraid-runner.py b/snapraid-runner.py index 14afd88..6a37ec8 100644 --- a/snapraid-runner.py +++ b/snapraid-runner.py @@ -37,7 +37,7 @@ def tee_log(infile, out_lines, log_level): return t -def snapraid_command(command, args={}): +def snapraid_command(command, args={}, ignore_errors=False): """ Run snapraid command Raises subprocess.CalledProcessError if errorlevel != 0 @@ -58,7 +58,7 @@ def snapraid_command(command, args={}): ret = p.wait() # sleep for a while to make pervent output mixup time.sleep(0.3) - if ret == 0: + if ret == 0 or ignore_errors: return out else: raise subprocess.CalledProcessError(ret, "snapraid " + command) @@ -228,11 +228,7 @@ def run(): finish(False) logging.info("Running diff...") - try: - diff_out = snapraid_command("diff") - except subprocess.CalledProcessError as e: - logging.error(e) - finish(False) + diff_out = snapraid_command("diff", ignore_errors=True) logging.info("*" * 60) diff_results = Counter(line.split(" ")[0] for line in diff_out)