diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2018-12-29 17:57:56 -0500 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2019-01-16 11:16:46 -0500 |
| commit | 2867371f1ae85d58ab661ca80bb406213d11a50c (patch) | |
| tree | 6d1f5c9071a5ea4a1ae2154f35aa2c8e0d237977 /mesonbuild | |
| parent | bdf301d05beb22305cfbdbf7b0ed6f600862e03f (diff) | |
| download | meson-2867371f1ae85d58ab661ca80bb406213d11a50c.zip meson-2867371f1ae85d58ab661ca80bb406213d11a50c.tar.gz meson-2867371f1ae85d58ab661ca80bb406213d11a50c.tar.bz2 | |
dependency_fallback: Pass display_name in arguments
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/interpreter.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 16d4ced..28f627f 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -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' |