clean up scrub arg checking code

fmoledina · Oct 30, 2021 · afb83c6 · afb83c6
1 parent 78f96e6
commit afb83c6
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/snapraid-btrfs-runner.py b/snapraid-btrfs-runner.py
@@ -368,17 +368,20 @@ def run():
         logging.info("Running scrub...")
         # if using new, bad, or full, ignore older-than config option
         try:
+            int(config["scrub"]["plan"])
+        except ValueError:
             snapraid_args_extend = {
-                "plan": int(config["scrub"]["plan"]),
-                "older-than": config["scrub"]["older-than"],
+                "plan": config["scrub"]["plan"],
             }
-        except:
+            if config["scrub"]["older-than"] > 0:
+                logging.warning(
+                    "Ignoring 'older-than' config item with scrub plan '{}'".format(
+                        config["scrub"]["plan"]))
+        else:
             snapraid_args_extend = {
                 "plan": config["scrub"]["plan"],
+                "older-than": config["scrub"]["older-than"],
             }
-            logging.warning(
-                "Ignoring 'older-than' config item with scrub plan '{}'".format(
-                    config["scrub"]["plan"]))
         try:
             snapraid_btrfs_command("scrub", snapraid_args = snapraid_args_extend, snapraid_btrfs_args = snapraid_btrfs_args_extend)
         except subprocess.CalledProcessError as e: