From 969ae6e0e1ffe3d1acb6ef0ef93c809b566a3ea1 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Tue, 29 Mar 2022 18:35:47 -0400 Subject: [PATCH] Correctly handle --version argument to runpython Followup to #10204. --- mesonbuild/mesonmain.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/mesonbuild/mesonmain.py b/mesonbuild/mesonmain.py index 04ea8f5f6..5d720f0d0 100644 --- a/mesonbuild/mesonmain.py +++ b/mesonbuild/mesonmain.py @@ -96,16 +96,14 @@ class CommandLineParser: def add_runpython_arguments(self, parser: argparse.ArgumentParser): parser.add_argument('-c', action='store_true', dest='eval_arg', default=False) - parser.add_argument('--version', action='store_true') - parser.add_argument('script_file', nargs='?') + parser.add_argument('--version', action='version', version=platform.python_version()) + parser.add_argument('script_file') parser.add_argument('script_args', nargs=argparse.REMAINDER) def run_runpython_command(self, options): import runpy if options.eval_arg: exec(options.script_file) - elif options.version: - print(platform.python_version()) else: sys.argv[1:] = options.script_args sys.path.insert(0, os.path.dirname(options.script_file))