From: Mauro Carvalho Chehab Date: Tue, 8 Apr 2025 10:09:07 +0000 (+0800) Subject: scripts/kernel-doc.py: output warnings the same way as kerneldoc X-Git-Tag: v6.16-rc1~176^2~49^2~29 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a4e24128f4c0e1d83ebc7f79812c16f1e3fc9e0;p=thirdparty%2Fkernel%2Fstable.git scripts/kernel-doc.py: output warnings the same way as kerneldoc Add a formatter to logging to produce outputs in a similar way to kernel-doc. This should help making it more compatible with existing scripts. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Jonathan Corbet Link: https://lore.kernel.org/r/559f0ad9e6fecfcbb3cc38b6097463bd38d58629.1744106241.git.mchehab+huawei@kernel.org --- diff --git a/scripts/kernel-doc.py b/scripts/kernel-doc.py index 114f3699bf7c6..8625209d62932 100755 --- a/scripts/kernel-doc.py +++ b/scripts/kernel-doc.py @@ -2715,6 +2715,11 @@ neither here nor at the original Perl script. """ +class MsgFormatter(logging.Formatter): + def format(self, record): + record.levelname = record.levelname.capitalize() + return logging.Formatter.format(self, record) + def main(): """Main program""" @@ -2799,10 +2804,19 @@ def main(): args.wshort_desc = True args.wcontents_before_sections = True + logger = logging.getLogger() + if not args.debug: - level = logging.INFO + logger.setLevel(logging.INFO) else: - level = logging.DEBUG + logger.setLevel(logging.DEBUG) + + formatter = MsgFormatter('%(levelname)s: %(message)s') + + handler = logging.StreamHandler() + handler.setFormatter(formatter) + + logger.addHandler(handler) if args.man: out_style = ManFormat() @@ -2811,8 +2825,6 @@ def main(): else: out_style = RestFormat() - logging.basicConfig(level=level, format="%(levelname)s: %(message)s") - kfiles = KernelFiles(files=args.files, verbose=args.verbose, out_style=out_style, werror=args.werror, wreturn=args.wreturn, wshort_desc=args.wshort_desc,