From: Nabih Estefan Date: Thu, 27 Feb 2025 18:04:54 +0000 (+0000) Subject: scripts: dump stdin on meson-buildoptions error X-Git-Tag: v10.0.0-rc0~19^2~23 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cff666a3aee566889fcc1ab7167ca0a727af7167;p=thirdparty%2Fqemu.git scripts: dump stdin on meson-buildoptions error Dump sys.stdin when it errors on meson-buildoptions.py, letting us debug the build errors instead of just saying "Couldn't parse" Signed-off-by: Nabih Estefan Signed-off-by: Patrick Venture Link: https://lore.kernel.org/r/20250227180454.2006757-1-venture@google.com Signed-off-by: Paolo Bonzini --- diff --git a/scripts/meson-buildoptions.py b/scripts/meson-buildoptions.py index 4814a8ff61..a3e22471b2 100644 --- a/scripts/meson-buildoptions.py +++ b/scripts/meson-buildoptions.py @@ -241,8 +241,14 @@ def print_parse(options): print(" esac") print("}") - -options = load_options(json.load(sys.stdin)) +json_data = sys.stdin.read() +try: + options = load_options(json.loads(json_data)) +except: + print("Failure in scripts/meson-buildoptions.py parsing stdin as json", + file=sys.stderr) + print(json_data, file=sys.stderr) + sys.exit(1) print("# This file is generated by meson-buildoptions.py, do not edit!") print_help(options) print_parse(options)