aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/interpreterbase.py
diff options
context:
space:
mode:
authorfchin <Frankie.Chin@biamp.com>2019-11-12 12:11:12 +1000
committerMichael Hirsch, Ph.D <10931741+scivision@users.noreply.github.com>2019-11-12 09:21:10 -0500
commit4e460f04f3b2d767027c7769bab6eb8029b22422 (patch)
tree866c4d7e02601ea2e3fceb15cd4d2a34c75ad383 /mesonbuild/interpreterbase.py
parentadb4e071e688534fd7c163719f005239cd2f7c25 (diff)
downloadmeson-4e460f04f3b2d767027c7769bab6eb8029b22422.zip
meson-4e460f04f3b2d767027c7769bab6eb8029b22422.tar.gz
meson-4e460f04f3b2d767027c7769bab6eb8029b22422.tar.bz2
Fixed issue that the key's value type wasn't checked correctly.
Added two new failing tests.
Diffstat (limited to 'mesonbuild/interpreterbase.py')
-rw-r--r--mesonbuild/interpreterbase.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/interpreterbase.py b/mesonbuild/interpreterbase.py
index a04ff38..46f578e 100644
--- a/mesonbuild/interpreterbase.py
+++ b/mesonbuild/interpreterbase.py
@@ -735,7 +735,7 @@ The result of this is undefined and will become a hard error in a future Meson r
for (key, value) in addition.items():
if isinstance(key, str):
new_addition[key] = value
- elif isinstance(key, mparser.IdNode):
+ elif isinstance(key, mparser.IdNode) and isinstance(self.get_variable(key.value), str):
FeatureNew('Adding dictionary entry using string variable as key', '0.53.0').use(self.subproject)
new_addition[self.get_variable(key.value)] = value
else: