diff options
| author | QMK Bot <hello@qmk.fm> | 2023-10-16 22:44:27 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2023-10-16 22:44:27 +0000 |
| commit | 20cefe254d4f29e01e01f07ed61bff2e3fb485d0 (patch) | |
| tree | d0557ea8e4a49a10888c10d2f2fc1b7c6fec8149 /lib/python/qmk/cli | |
| parent | 184c5844be5bf8a03a2836a5ff8c4446b882f9e0 (diff) | |
| parent | f6c70c40af502923594e76bf079f602ed88a2341 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'lib/python/qmk/cli')
| -rw-r--r-- | lib/python/qmk/cli/find.py | 2 | ||||
| -rwxr-xr-x | lib/python/qmk/cli/mass_compile.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/python/qmk/cli/find.py b/lib/python/qmk/cli/find.py index 2836eb8a54..f2135bbc16 100644 --- a/lib/python/qmk/cli/find.py +++ b/lib/python/qmk/cli/find.py @@ -23,7 +23,7 @@ def find(cli): if len(cli.args.filter) == 0 and len(cli.args.print) > 0: cli.log.warning('No filters supplied -- keymaps not parsed, unable to print requested values.') - targets = search_keymap_targets(cli.args.keymap, cli.args.filter, cli.args.print) + targets = search_keymap_targets([('all', cli.config.find.keymap)], cli.args.filter, cli.args.print) for keyboard, keymap, print_vals in targets: print(f'{keyboard}:{keymap}') diff --git a/lib/python/qmk/cli/mass_compile.py b/lib/python/qmk/cli/mass_compile.py index 1227f435e7..06e6e411a7 100755 --- a/lib/python/qmk/cli/mass_compile.py +++ b/lib/python/qmk/cli/mass_compile.py @@ -97,6 +97,6 @@ def mass_compile(cli): if len(cli.args.builds) > 0: targets = search_make_targets(cli.args.builds, cli.args.filter) else: - targets = search_keymap_targets(cli.args.keymap, cli.args.filter) + targets = search_keymap_targets([('all', cli.config.mass_compile.keymap)], cli.args.filter) - return mass_compile_targets(targets, cli.args.clean, cli.args.dry_run, cli.args.no_temp, cli.args.parallel, cli.args.env) + return mass_compile_targets(targets, cli.args.clean, cli.args.dry_run, cli.config.mass_compile.no_temp, cli.config.mass_compile.parallel, cli.args.env) |