From 24c619a9b104862c3a3db9faad1f36fc618da88f Mon Sep 17 00:00:00 2001 From: Lucas Werkmeister Date: Mon, 27 Feb 2017 00:02:19 +0100 Subject: [PATCH] Fix default file parsing of store_true options MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit With action='store_true', argparse adds a default value of False if the option isn’t specified, so it could never be None. --- mkosi | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/mkosi b/mkosi index 8ff86c468..ade0e2df9 100755 --- a/mkosi +++ b/mkosi @@ -1708,7 +1708,7 @@ def process_setting(args, section, key, value): if args.output is None: args.output = value elif key == "Force": - if args.force is None: + if not args.force: args.force = parse_boolean(value) elif key == "Bootable": if args.bootable is None: @@ -1717,7 +1717,7 @@ def process_setting(args, section, key, value): if args.kernel_commandline is None: args.kernel_commandline = value elif key == "SecureBoot": - if args.secure_boot is None: + if not args.secure_boot: args.secure_boot = parse_boolean(value) elif key == "SecureBootKey": if args.secure_boot_key is None: @@ -1726,7 +1726,7 @@ def process_setting(args, section, key, value): if args.secure_boot_certificate is None: args.secure_boot_certificate = value elif key == "ReadOnly": - if args.read_only is None: + if not args.read_only: args.read_only = parse_boolean(value) elif key == "Encrypt": if args.encrypt is None: @@ -1734,13 +1734,13 @@ def process_setting(args, section, key, value): raise ValueError("Invalid encryption setting: "+ value) args.encrypt = value elif key == "Verity": - if args.verity is None: + if not args.verity: args.verity = parse_boolean(value) elif key == "Compress": - if args.compress is None: + if not args.compress: args.compress = parse_boolean(value) elif key == "XZ": - if args.xz is None: + if not args.xz: args.xz = parse_boolean(value) elif key is None: return True @@ -1754,7 +1754,7 @@ def process_setting(args, section, key, value): else: args.packages.extend(list_value) elif key == "WithDocs": - if args.with_docs is None: + if not args.with_docs: args.with_docs = parse_boolean(value) elif key == "Cache": if args.cache_path is None: @@ -1809,10 +1809,10 @@ def process_setting(args, section, key, value): return False elif section == "Validation": if key == "CheckSum": - if args.checksum is None: + if not args.checksum: args.checksum = parse_boolean(value) elif key == "Sign": - if args.sign is None: + if not args.sign: args.sign = parse_boolean(value) elif key == "Key": if args.key is None: -- 2.47.2