From 6af9025eea16d818da69558564bff3b69bd01ea3 Mon Sep 17 00:00:00 2001 From: Chronial Date: Fri, 21 Feb 2014 16:21:07 +0100 Subject: [PATCH] allow disabling of scrub from command line --- snapraid-runner.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/snapraid-runner.py b/snapraid-runner.py index e710ec5..062858c 100644 --- a/snapraid-runner.py +++ b/snapraid-runner.py @@ -106,10 +106,10 @@ def finish(is_success): sys.exit(0 if is_success else 1) -def load_config(file): +def load_config(args): global config parser = ConfigParser.RawConfigParser() - parser.read(file) + parser.read(args.conf) sections = ["snapraid", "logging", "email", "smtp", "scrub"] config = dict((x, defaultdict(lambda: "")) for x in sections) for section in parser.sections(): @@ -130,6 +130,9 @@ def load_config(file): config["scrub"]["enabled"] = (config["scrub"]["enabled"].lower() == "true") config["email"]["short"] = (config["email"]["short"].lower() == "true") + if args.scrub is not None: + config["scrub"]["enabled"] = args.scrub + def setup_logger(): log_format = logging.Formatter( @@ -166,9 +169,13 @@ def setup_logger(): def main(): parser = argparse.ArgumentParser() - parser.add_argument("-c", "--conf", nargs=1, + parser.add_argument("-c", "--conf", default="snapraid-runner.conf", - help="Configuration file (default %(default)s)") + metavar="CONFIG", + help="Configuration file (default: %(default)s)") + parser.add_argument("--no-scrub", action='store_false', + dest='scrub', default=None, + help="Do not scrub (overrides config)") args = parser.parse_args() if not os.path.exists(args.conf): @@ -177,7 +184,7 @@ def main(): sys.exit(2) try: - load_config(args.conf) + load_config(args) except: print("unexpected exception while loading config") print traceback.format_exc()