~ruther/qmk_firmware

f12000a1b60dea2db20ed496294ef83765fd372f — QMK Bot 4 years ago 2663436 + c075431
Merge remote-tracking branch 'origin/master' into develop
2 files changed, 4 insertions(+), 2 deletions(-)

M lib/python/qmk/cli/compile.py
M lib/python/qmk/cli/flash.py
M lib/python/qmk/cli/compile.py => lib/python/qmk/cli/compile.py +2 -1
@@ 48,7 48,8 @@ def compile(cli):
        cli.log.info('Compiling keymap with {fg_cyan}%s', ' '.join(command))
        if not cli.args.dry_run:
            cli.echo('\n')
            subprocess.run(command)
            compile = subprocess.run(command)
            return compile.returncode

    else:
        cli.log.error('You must supply a configurator export, both `--keyboard` and `--keymap`, or be in a directory for a keyboard or keymap.')

M lib/python/qmk/cli/flash.py => lib/python/qmk/cli/flash.py +2 -1
@@ 81,7 81,8 @@ def flash(cli):
        cli.log.info('Compiling keymap with {fg_cyan}%s', ' '.join(command))
        if not cli.args.dry_run:
            cli.echo('\n')
            subprocess.run(command)
            compile = subprocess.run(command)
            return compile.returncode

    else:
        cli.log.error('You must supply a configurator export, both `--keyboard` and `--keymap`, or be in a directory for a keyboard or keymap.')