diff options
author | Xavier Claessens <xavier.claessens@collabora.com> | 2021-03-10 14:19:48 -0500 |
---|---|---|
committer | Xavier Claessens <xavier.claessens@collabora.com> | 2021-03-22 21:29:14 -0400 |
commit | 8cd4d0b2832666f19660b9006040e5ff7e5d4576 (patch) | |
tree | e649e579f16f81c9ce6380fa3f1f78b2120bea91 /mesonbuild/mlog.py | |
parent | 7c3418204f824a613c67e7ccd06ef6983656e904 (diff) | |
download | meson-8cd4d0b2832666f19660b9006040e5ff7e5d4576.zip meson-8cd4d0b2832666f19660b9006040e5ff7e5d4576.tar.gz meson-8cd4d0b2832666f19660b9006040e5ff7e5d4576.tar.bz2 |
mlog: Do not print 'subproject|' for the message 'Executing subproject'
It already contains the full callstack and it's more visible when it's
standing on its own line.
Diffstat (limited to 'mesonbuild/mlog.py')
-rw-r--r-- | mesonbuild/mlog.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mesonbuild/mlog.py b/mesonbuild/mlog.py index c51922a..38a4805 100644 --- a/mesonbuild/mlog.py +++ b/mesonbuild/mlog.py @@ -201,7 +201,7 @@ def process_markup(args: T.Sequence[T.Union[AnsiDecorator, str]], keep: bool) -> arr.append(str(arg)) return arr -def force_print(*args: str, **kwargs: T.Any) -> None: +def force_print(*args: str, nested: str, **kwargs: T.Any) -> None: if log_disable_stdout: return iostr = io.StringIO() @@ -210,7 +210,7 @@ def force_print(*args: str, **kwargs: T.Any) -> None: raw = iostr.getvalue() if log_depth: - prepend = log_depth[-1] + '| ' + prepend = log_depth[-1] + '| ' if nested else '' lines = [] for l in raw.split('\n'): l = l.strip() @@ -250,6 +250,7 @@ def log(*args: T.Union[str, AnsiDecorator], is_error: bool = False, def _log(*args: T.Union[str, AnsiDecorator], is_error: bool = False, **kwargs: T.Any) -> None: + nested = kwargs.pop('nested', True) arr = process_markup(args, False) if log_file is not None: print(*arr, file=log_file, **kwargs) @@ -257,7 +258,7 @@ def _log(*args: T.Union[str, AnsiDecorator], is_error: bool = False, if colorize_console(): arr = process_markup(args, True) if not log_errors_only or is_error: - force_print(*arr, **kwargs) + force_print(*arr, nested=nested, **kwargs) def log_once(*args: T.Union[str, AnsiDecorator], is_error: bool = False, **kwargs: T.Any) -> None: |