From 6bd10f151aa9992a68c1868b2825b9b702568b9d Mon Sep 17 00:00:00 2001
From: Virgile Prevosto <virgile.prevosto@m4x.org>
Date: Wed, 12 Jul 2023 10:28:38 +0200
Subject: [PATCH] [machdep] minor improvements to generator
- fix f-string as reported by @maroneze
- --verbose is now reflected in `logging` level as well.
---
share/machdeps/make_machdep/make_machdep.py | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/share/machdeps/make_machdep/make_machdep.py b/share/machdeps/make_machdep/make_machdep.py
index b1cbb124d43..c6045ab856a 100755
--- a/share/machdeps/make_machdep/make_machdep.py
+++ b/share/machdeps/make_machdep/make_machdep.py
@@ -49,8 +49,6 @@ from yaml.representer import Representer
my_path = Path(sys.argv[0]).parent
-logging.basicConfig(format="%(levelname)s: %(message)s")
-
parser = argparse.ArgumentParser(prog="make_machdep")
parser.add_argument("-v", "--verbose", action="store_true")
parser.add_argument("-o", type=argparse.FileType("w"), dest="dest_file")
@@ -104,6 +102,11 @@ parser.add_argument(
args, other_args = parser.parse_known_args()
+if args.verbose:
+ logging.basicConfig(format="%(levelname)s: %(message)s", level=logging.INFO)
+else:
+ logging.basicConfig(format="%(levelname)s: %(message)s")
+
if not args.compiler_flags:
args.compiler_flags = ["-c"]
@@ -347,7 +350,7 @@ for f, typ in source_files:
name = p.stem
if proc.returncode != 0:
logging.warning(
- f"error in preprocessing value '{p}', some value might not be filled\ncompiler output is:{proc.stderr.decode()}"
+ f"error in preprocessing value '{p}', some values might not be filled\ncompiler output is:{proc.stderr.decode()}"
)
if name in machdep:
machdep[name] = {}
@@ -419,7 +422,7 @@ if proc.returncode == 0:
lines += f"{line.strip()}\n"
machdep["custom_defs"] = custom_defs(lines)
else:
- logging.warning("could not determine predefined macros. compiler output is:\n{proc.stderr}")
+ logging.warning(f"could not determine predefined macros. compiler output is:\n{proc.stderr}")
if args.from_file and args.in_place:
machdep["machdep_name"] = Path(args.from_file).stem
--
GitLab