Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-19 19:34:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

buildman: Move dry-run handling higher in do_buildman()

Browse source 
Move this up above where the builder is created, since it no-longer makes
use of the builder.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2023-07-19 17:48:37 -06:00
parent d233dfb07d
commit f0207d77b5
1 changed files with 43 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tools/buildman/control.py
View file

@ -395,6 +395,13 @@ def do_buildman(options, args, toolchains=None, make_func=None, brds=None,
output_dir = os.path.join(options.output_dir, dirname) output_dir = os.path.join(options.output_dir, dirname)
if clean_dir and os.path.exists(output_dir): if clean_dir and os.path.exists(output_dir):
shutil.rmtree(output_dir) shutil.rmtree(output_dir)
# For a dry run, just show our actions as a sanity check
if options.dry_run:
show_actions(series, why_selected, selected, output_dir, options,
board_warnings)
return 0
adjust_cfg = cfgutil.convert_list_to_dict(options.adjust_cfg) adjust_cfg = cfgutil.convert_list_to_dict(options.adjust_cfg)
# Drop LOCALVERSION_AUTO since it changes the version string on every commit # Drop LOCALVERSION_AUTO since it changes the version string on every commit
@ -425,11 +432,6 @@ def do_buildman(options, args, toolchains=None, make_func=None, brds=None,
if make_func: if make_func:
builder.do_make = make_func builder.do_make = make_func
# For a dry run, just show our actions as a sanity check
if options.dry_run:
show_actions(series, why_selected, selected, output_dir, options,
board_warnings)
else:
builder.force_build = options.force_build builder.force_build = options.force_build
builder.force_build_failures = options.force_build_failures builder.force_build_failures = options.force_build_failures
builder.force_reconfig = options.force_reconfig builder.force_reconfig = options.force_reconfig