diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2021-07-18 15:03:54 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-18 15:03:54 +0300 |
commit | 0be74c78352bbe996599aed39468dadec45d1109 (patch) | |
tree | de1ac24c6dec3f496cb86b605d8d1af044cb33c1 /mesonbuild/mdist.py | |
parent | 6614c7352645770d68bc1adb782fef4da323815a (diff) | |
parent | b5146c02effd53a8b71b2d10f95ecd2358f8241d (diff) | |
download | meson-0be74c78352bbe996599aed39468dadec45d1109.zip meson-0be74c78352bbe996599aed39468dadec45d1109.tar.gz meson-0be74c78352bbe996599aed39468dadec45d1109.tar.bz2 |
Merge pull request #8972 from bonzini/C-symlink
resolve symlinks passed to -C
Diffstat (limited to 'mesonbuild/mdist.py')
-rw-r--r-- | mesonbuild/mdist.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/mdist.py b/mesonbuild/mdist.py index e63ab17..afa1b4c 100644 --- a/mesonbuild/mdist.py +++ b/mesonbuild/mdist.py @@ -23,7 +23,8 @@ import json from glob import glob from pathlib import Path from mesonbuild.environment import detect_ninja -from mesonbuild.mesonlib import windows_proof_rmtree, MesonException, quiet_git +from mesonbuild.mesonlib import (MesonException, RealPathAction, quiet_git, + windows_proof_rmtree) from mesonbuild.wrap import wrap from mesonbuild import mlog, build from .scripts.meson_exe import run_exe @@ -35,7 +36,7 @@ archive_extension = {'gztar': '.tar.gz', 'zip': '.zip'} def add_arguments(parser): - parser.add_argument('-C', default='.', dest='wd', + parser.add_argument('-C', dest='wd', action=RealPathAction, help='directory to cd into before running') parser.add_argument('--formats', default='xztar', help='Comma separated list of archive types to create. Supports xztar (default), gztar, and zip.') @@ -270,7 +271,6 @@ def determine_archives_to_generate(options): return result def run(options): - options.wd = os.path.abspath(options.wd) buildfile = Path(options.wd) / 'meson-private' / 'build.dat' if not buildfile.is_file(): raise MesonException(f'Directory {options.wd!r} does not seem to be a Meson build directory.') |