cleanup output

This commit is contained in:
Zach White 2021-06-27 17:04:24 -07:00
parent 335dd3c5c3
commit 4fadb98a02

View file

@ -462,7 +462,6 @@ def _execute_compile(keyboard, keymap, command, target, returncodes=None):
cli.log.debug('Skipping keyboard %s, no %s keymap found.', keyboard, keymap) cli.log.debug('Skipping keyboard %s, no %s keymap found.', keyboard, keymap)
return 0 return 0
print()
if target: if target:
cli.log.info('Building firmware for {fg_cyan}%s{fg_reset} with keymap {fg_cyan}%s{fg_reset} and target {fg_cyan}%s', keyboard, keymap, target) cli.log.info('Building firmware for {fg_cyan}%s{fg_reset} with keymap {fg_cyan}%s{fg_reset} and target {fg_cyan}%s', keyboard, keymap, target)
else: else:
@ -470,16 +469,15 @@ def _execute_compile(keyboard, keymap, command, target, returncodes=None):
cli.log.debug('Running make command: {fg_blue}%s', ' '.join(command)) cli.log.debug('Running make command: {fg_blue}%s', ' '.join(command))
if not cli.args.dry_run: if not cli.args.dry_run:
compile = cli.run(command, capture_output=False) compile = cli.run(command, combined_output=True)
cli.acquire_lock() cli.acquire_lock()
returncodes.append(compile.returncode) returncodes.append(compile.returncode)
cli.release_lock() cli.release_lock()
if compile.returncode == 0: if compile.returncode != 0:
cli.log.info('Success!') cli.log.info('Could not build firmware for {fg_cyan}%s{fg_reset} with keymap {fg_cyan}%s', keyboard, keymap)
else: print(compile.stdout)
cli.log.error('Failed!')
@lru_cache() @lru_cache()