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

Merge pull request #993 from centricular/cached-dep-required-attr 

dependency: Check that cached_dep has the 'required' attribute
This commit is contained in:
Jussi Pakkanen 2016-11-06 09:11:42 -08:00 committed by GitHub
parent ae8a0a1438 cb36843863
commit f8bf37979b
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mesonbuild/interpreter.py
View File

@ -1856,12 +1856,10 @@ requirements use the version keyword argument instead.''')
# Cached dep has the wrong version. Check if an external # Cached dep has the wrong version. Check if an external
# dependency or a fallback dependency provides it. # dependency or a fallback dependency provides it.
cached_dep = None cached_dep = None
# Don't re-use cached dep if it wasn't required but this one is, # Don't re-use cached dep if it wasn't required but this one is,
# so we properly go into fallback/error code paths # so we properly go into fallback/error code paths
if 'required' in kwargs and cached_dep is not None: if kwargs.get('required', True) and not getattr(cached_dep, 'required', False):
if not cached_dep.required and kwargs.get('required', True): cached_dep = None
cached_dep = None
if cached_dep: if cached_dep:
dep = cached_dep dep = cached_dep

2
test cases/failing/34 dependency not-required then required/meson.build
View File

@ -1,4 +1,4 @@
project('dep-test', 'c', version : '1.0') project('dep-test', 'c', version : '1.0')
foo_dep = dependency('foo-bar-xyz-12.3', required : false) foo_dep = dependency('foo-bar-xyz-12.3', required : false)
bar_dep = dependency('foo-bar-xyz-12.3', required : true) bar_dep = dependency('foo-bar-xyz-12.3')