X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=kconfig_hardened_check%2F__init__.py;h=8f244985ecbb4d55f6ee53426e9ac6462d9eeb7f;hb=90b7e8cd79accaee3ec9b535947c15c860163be3;hp=7ba62e0fc40e68772dc811a096e8033dfd180fa2;hpb=895aecbfb8bc5e488db5098cd3fadf3f59d82881;p=kconfig-hardened-check.git diff --git a/kconfig_hardened_check/__init__.py b/kconfig_hardened_check/__init__.py index 7ba62e0..8f24498 100644 --- a/kconfig_hardened_check/__init__.py +++ b/kconfig_hardened_check/__init__.py @@ -101,8 +101,8 @@ def print_unknown_options(checklist, parsed_options): def print_checklist(mode, checklist, with_results): if mode == 'json': output = [] - for o in checklist: - output.append(o.json_dump(with_results)) + for opt in checklist: + output.append(opt.json_dump(with_results)) print(json.dumps(output)) return @@ -142,8 +142,7 @@ def print_checklist(mode, checklist, with_results): fail_suppressed = ' (suppressed in output)' if mode == 'show_fail': ok_suppressed = ' (suppressed in output)' - if mode != 'json': - print(f'[+] Config check is finished: \'OK\' - {ok_count}{ok_suppressed} / \'FAIL\' - {fail_count}{fail_suppressed}') + print(f'[+] Config check is finished: \'OK\' - {ok_count}{ok_suppressed} / \'FAIL\' - {fail_count}{fail_suppressed}') def parse_kconfig_file(parsed_options, fname): @@ -259,10 +258,12 @@ def main(): parsed_kconfig_options = OrderedDict() parse_kconfig_file(parsed_kconfig_options, args.config) populate_with_data(config_checklist, parsed_kconfig_options, 'kconfig') + + # populate the checklist with the kernel version data populate_with_data(config_checklist, kernel_version, 'version') if args.cmdline: - # populate the checklist with the parsed kconfig data + # populate the checklist with the parsed cmdline data parsed_cmdline_options = OrderedDict() parse_cmdline_file(parsed_cmdline_options, args.cmdline) populate_with_data(config_checklist, parsed_cmdline_options, 'cmdline')