Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

interpreter: delete now unnecessary code 

Only func_configure_file could reach this code, but now it cannot due to
the use of typed_kwargs, so delete it.
This commit is contained in:
Dylan Baker 2022-01-28 16:32:48 -08:00 committed by Eli Schwartz
parent 23f666b497
commit 0f090147ef
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mesonbuild/interpreter/interpreter.py
View File

@ -730,8 +730,6 @@ external dependencies (including libraries) must go to "dependencies".''')
mlog.warning(implicit_check_false_warning, once=True) mlog.warning(implicit_check_false_warning, once=True)
check = False check = False
m = 'must be a string, or the output of find_program(), files() '\
'or configure_file(), or a compiler object; not {!r}'
overridden_msg = ('Program {!r} was overridden with the compiled ' overridden_msg = ('Program {!r} was overridden with the compiled '
'executable {!r} and therefore cannot be used during ' 'executable {!r} and therefore cannot be used during '
'configuration') 'configuration')
@ -753,9 +751,6 @@ external dependencies (including libraries) must go to "dependencies".''')
else: else:
if isinstance(cmd, mesonlib.File): if isinstance(cmd, mesonlib.File):
cmd = cmd.absolute_path(srcdir, builddir) cmd = cmd.absolute_path(srcdir, builddir)
# FIXME: This case can only be reached through configure_file, delete once that is typesafe
elif not isinstance(cmd, str):
raise InterpreterException('First argument ' + m.format(cmd))
# Prefer scripts in the current source directory # Prefer scripts in the current source directory
search_dir = os.path.join(srcdir, self.subdir) search_dir = os.path.join(srcdir, self.subdir)
prog = ExternalProgram(cmd, silent=True, search_dir=search_dir) prog = ExternalProgram(cmd, silent=True, search_dir=search_dir)