Skip to content

Commit db51dcf

Browse files
mdist: Hoist leftover late import
From 23d3b98, the meson command is exposed through a function. Therefore, the caveat no longer applies.
1 parent cb54f0d commit db51dcf

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

mesonbuild/mdist.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from glob import glob
2222
from pathlib import Path
2323
from mesonbuild.environment import detect_ninja
24-
from mesonbuild.mesonlib import (MesonException, RealPathAction, quiet_git,
24+
from mesonbuild.mesonlib import (MesonException, RealPathAction, get_meson_command, quiet_git,
2525
windows_proof_rmtree, setup_vsenv, OptionKey)
2626
from mesonbuild.msetup import add_arguments as msetup_argparse
2727
from mesonbuild.wrap import wrap
@@ -327,9 +327,6 @@ def run(options: argparse.Namespace) -> int:
327327
b = build.load(options.wd)
328328
need_vsenv = T.cast('bool', b.environment.coredata.get_option(OptionKey('vsenv')))
329329
setup_vsenv(need_vsenv)
330-
# This import must be load delayed, otherwise it will get the default
331-
# value of None.
332-
from mesonbuild.mesonlib import get_meson_command
333330
src_root = b.environment.source_dir
334331
bld_root = b.environment.build_dir
335332
priv_dir = os.path.join(bld_root, 'meson-private')

0 commit comments

Comments
 (0)