From 62e03579cf7dabf42799b82e30a9941071a41f2f Mon Sep 17 00:00:00 2001 From: Faisal Moledina Date: Fri, 29 Oct 2021 23:41:35 -0600 Subject: [PATCH] Fix scrub command for non-percentage plans --- snapraid-runner.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/snapraid-runner.py b/snapraid-runner.py index e45b2fa..124cf06 100644 --- a/snapraid-runner.py +++ b/snapraid-runner.py @@ -290,11 +290,21 @@ def run(): if config["scrub"]["enabled"]: logging.info("Running scrub...") + # if using new, bad, or full, ignore older-than config option try: - snapraid_command("scrub", { - "plan": config["scrub"]["plan"], + args_extend = { + "plan": int(config["scrub"]["plan"]), "older-than": config["scrub"]["older-than"], - }) + } + except: + args_extend = { + "plan": config["scrub"]["plan"], + } + logging.warning( + "Ignoring 'older-than' config item with scrub plan '{}'".format( + config["scrub"]["plan"])) + try: + snapraid_command("scrub", args_extend) except subprocess.CalledProcessError as e: logging.error(e) finish(False)