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

dependency_fallback: Pass display_name in arguments

This commit is contained in:
Xavier Claessens 2018-12-29 17:57:56 -05:00 committed by Xavier Claessens
parent bdf301d05b
commit 2867371f1a
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mesonbuild/interpreter.py
View File

@ -3013,7 +3013,7 @@ external dependencies (including libraries) must go to "dependencies".''')
if 'fallback' in kwargs:
if not exception:
exception = DependencyException("fallback for %s not found" % display_name)
fallback_dep = self.dependency_fallback(name, kwargs)
fallback_dep = self.dependency_fallback(display_name, kwargs)
if fallback_dep:
# Never add fallback deps to self.coredata.deps since we
# cannot cache them. They must always be evaluated else
@ -3058,8 +3058,7 @@ external dependencies (including libraries) must go to "dependencies".''')
raise InterpreterException('Fallback info must have exactly two items.')
return fbinfo
def dependency_fallback(self, name, kwargs):
display_name = name if name else '(anonymous)'
def dependency_fallback(self, display_name, kwargs):
if self.coredata.get_builtin_option('wrap_mode') == WrapMode.nofallback:
mlog.log('Not looking for a fallback subproject for the dependency',
mlog.bold(display_name), 'because:\nUse of fallback'