Fix compatibility with Snapraid 8.0

This commit is contained in:
Chronial committed 2015-04-27 12:14:50 +02:00
1 parent 716d30bc52
commit f6a2589741
1 file changed
+3 -7
+3 -7
View File
@@ -37,7 +37,7 @@ def tee_log(infile, out_lines, log_level):
return t return t
def snapraid_command(command, args={}): def snapraid_command(command, args={}, ignore_errors=False):
""" """
Run snapraid command Run snapraid command
Raises subprocess.CalledProcessError if errorlevel != 0 Raises subprocess.CalledProcessError if errorlevel != 0
@@ -58,7 +58,7 @@ def snapraid_command(command, args={}):
ret = p.wait() ret = p.wait()
# sleep for a while to make pervent output mixup # sleep for a while to make pervent output mixup
time.sleep(0.3) time.sleep(0.3)
if ret == 0: if ret == 0 or ignore_errors:
return out return out
else: else:
raise subprocess.CalledProcessError(ret, "snapraid " + command) raise subprocess.CalledProcessError(ret, "snapraid " + command)
@@ -228,11 +228,7 @@ def run():
finish(False) finish(False)
logging.info("Running diff...") logging.info("Running diff...")
try: diff_out = snapraid_command("diff", ignore_errors=True)
diff_out = snapraid_command("diff")
except subprocess.CalledProcessError as e:
logging.error(e)
finish(False)
logging.info("*" * 60) logging.info("*" * 60)
diff_results = Counter(line.split(" ")[0] for line in diff_out) diff_results = Counter(line.split(" ")[0] for line in diff_out)