diff --git a/src/python/jw/pkg/cmds/projects/CmdBuild.py b/src/python/jw/pkg/cmds/projects/CmdBuild.py index caf55f4e..914a4aff 100644 --- a/src/python/jw/pkg/cmds/projects/CmdBuild.py +++ b/src/python/jw/pkg/cmds/projects/CmdBuild.py @@ -92,9 +92,9 @@ class CmdBuild(Cmd): # export patt = self.app.is_excluded_from_build(module) if patt is not None: - print(f',{title} >') - print(f'| Configured to skip build on platform >{patt}<') - print(f'`{title} <') + log(NOTICE, f',{title} >') + log(NOTICE, f'| Configured to skip build on platform >{patt}<') + log(NOTICE, f'`{title} <') return make_cmd = [ "make", target ] @@ -137,7 +137,7 @@ class CmdBuild(Cmd): # export if m in modules: modules.remove(m) if not len(modules): - print("all modules cleaned") + log(NOTICE, "All modules cleaned") return else: for m in order: @@ -154,7 +154,7 @@ class CmdBuild(Cmd): # export env_exclude = os.getenv('BUILD_EXCLUDE', '') if len(env_exclude): - print("exluding modules from environment: " + env_exclude) + log(NOTICE, "Exluding modules from environment: " + env_exclude) exclude += " " + env_exclude # -- build @@ -165,8 +165,8 @@ class CmdBuild(Cmd): # export glob_prereq_types = [ "build", "run", "release", "devel" ] if target != 'order' and not args.build_order: - print("using prerequisite types " + ' '.join(glob_prereq_types)) - print("calculating order for modules ... ") + log(NOTICE, "Using prerequisite types " + ' '.join(glob_prereq_types)) + log(NOTICE, "Calculating order for modules ... ") calculate_order(order, modules, glob_prereq_types) if args.ignore_deps: @@ -177,17 +177,17 @@ class CmdBuild(Cmd): # export exit(0) cur_project = 0 - print("Building target %s in %d projects:" % (target, len(order))) + log(NOTICE, "Building target %s in %d projects:" % (target, len(order))) for m in order: cur_project += 1 - print(" %3d %s" % (cur_project, m)) + log(NOTICE, " %3d %s" % (cur_project, m)) if args.dry_run: exit(0) await run_make_on_modules(modules, order, target) - print(datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")) + log(NOTICE, 'Build done at {}' % (datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"))) dep_cache: dict[dict[str, str]] = {} diff --git a/src/python/jw/pkg/cmds/projects/CmdCheck.py b/src/python/jw/pkg/cmds/projects/CmdCheck.py index 92aabbef..8668c85d 100644 --- a/src/python/jw/pkg/cmds/projects/CmdCheck.py +++ b/src/python/jw/pkg/cmds/projects/CmdCheck.py @@ -19,6 +19,6 @@ class CmdCheck(Cmd): # export async def _run(self, args: Namespace) -> None: path = self.app.find_circular_deps(args.module, args.flavour) if path: - print(f'Found circular dependency in flavour {args.flavour}:', ' -> '.join(path)) + log(NOTICE, f'Found circular dependency in flavour {args.flavour}:', ' -> '.join(path)) exit(1) - print(f'No circular dependency found for flavour {args.flavour} in modules:', ' '.join(args.module)) + log(NOTICE, f'No circular dependency found for flavour {args.flavour} in modules:', ' '.join(args.module)) diff --git a/src/python/jw/pkg/lib/util.py b/src/python/jw/pkg/lib/util.py index c671555a..8e6dce1b 100644 --- a/src/python/jw/pkg/lib/util.py +++ b/src/python/jw/pkg/lib/util.py @@ -57,7 +57,7 @@ async def run_curl(args: list[str], parse_json: bool=True, wd=None, throw=None, size = len(ret) except: pass - print(f'Failed to parse {size} bytes output of command ' + log(ERR, f'Failed to parse {size} bytes output of command ' + f'>{pretty_cmd(cmd, wd)}< ({str(e)}): "{ret}"', file=sys.stderr) raise return ret, stderr, status