Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2025-03-16 23:07:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

moveconfig: Reduce the amount of output

Browse source 
Output a single line in the case where the defconfig only has one line
of output. Show the name without the _defconfig suffix, since that is the
same for all boards.

Use a list for the log so it is easier to process at the end.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2023-09-23 13:44:07 -06:00
parent 5aba58cf3b
commit 9461bf0d65
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
tools/moveconfig.py
View file

@ -410,7 +410,7 @@ class Slot:
self.state = STATE_IDLE
self.failed_boards = set()
self.defconfig = None
self.log = ''
self.log = []
self.current_src_dir = None
self.proc = None
@ -446,7 +446,7 @@ class Slot:
return False
self.defconfig = defconfig
self.log = ''
self.log = []
self.current_src_dir = self.reference_src_dir
self.do_defconfig()
return True
@ -498,11 +498,12 @@ class Slot:
def handle_error(self):
"""Handle error cases."""
self.log += color_text(self.args.color, COLOR_LIGHT_RED,
'Failed to process.\n')
self.log.append(color_text(self.args.color, COLOR_LIGHT_RED,
'Failed to process'))
if self.args.verbose:
self.log += color_text(self.args.color, COLOR_LIGHT_CYAN,
self.proc.stderr.read().decode())
for line in self.proc.stderr.read().decode().splitlines():
self.log.append(color_text(self.args.color, COLOR_LIGHT_CYAN,
line))
self.finish(False)
def do_defconfig(self):
@ -522,8 +523,8 @@ class Slot:
try:
tchain = self.toolchains.Select(arch)
except ValueError:
self.log += color_text(self.args.color, COLOR_YELLOW,
f"Tool chain for '{arch}' is missing. Do nothing.\n")
self.log.append(color_text(self.args.color, COLOR_YELLOW,
f"Tool chain for '{arch}' is missing: do nothing"))
self.finish(False)
return
env = tchain.MakeEnvironment(False)
@ -565,8 +566,8 @@ class Slot:
updated = not filecmp.cmp(orig_defconfig, new_defconfig)
if updated:
self.log += color_text(self.args.color, COLOR_LIGHT_BLUE,
'defconfig was updated.\n')
self.log.append(color_text(self.args.color, COLOR_LIGHT_BLUE,
'defconfig updated'))
if not self.args.dry_run and updated:
shutil.move(new_defconfig, orig_defconfig)
@ -581,9 +582,13 @@ class Slot:
"""
# output at least 30 characters to hide the "* defconfigs out of *".
if self.log:
log = self.defconfig.ljust(30) + '\n'
name = self.defconfig[:-len('_defconfig')]
log += '\n'.join([ ' ' + s for s in self.log.split('\n') ])
# Put the first log line on the first line
log = name.ljust(20) + ' ' + self.log[0]
if len(self.log) > 1:
log += '\n' + '\n'.join([' ' + s for s in self.log[1:]])
# Some threads are running in parallel.
# Print log atomically to not mix up logs from different threads.
print(log, file=(sys.stdout if success else sys.stderr))