summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Sales de Andrade <quantum.analyst@gmail.com>2022-03-29 18:35:47 -0400
committerNirbheek Chauhan <nirbheek.chauhan@gmail.com>2022-05-31 13:15:42 +0530
commit5b8a21325e28c7dc52bf5eb9772124f9ca2e54e3 (patch)
treedd6756a1c70286d923d7be6faca643dd21e10b43
parenteb2bd864558e824be57893b1b85c94d184b14e78 (diff)
downloadmeson-5b8a21325e28c7dc52bf5eb9772124f9ca2e54e3.tar.gz
Correctly handle --version argument to runpython
Followup to #10204.
-rw-r--r--mesonbuild/mesonmain.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/mesonbuild/mesonmain.py b/mesonbuild/mesonmain.py
index b94518c6a..58acbc464 100644
--- a/mesonbuild/mesonmain.py
+++ b/mesonbuild/mesonmain.py
@@ -94,16 +94,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))