aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.com>2020-02-01 10:33:59 +0100
committerXavier Claessens <xclaesse@gmail.com>2020-02-01 11:21:16 +0100
commit31f00c11d32eff4b31516f4425f755f615ee6594 (patch)
tree0eab01958f8ea05e22a5b360b50c92e69cecba9c
parent402f7afdb03fa59b28e1c01b490b9673382f1ba4 (diff)
downloadmeson-31f00c11d32eff4b31516f4425f755f615ee6594.zip
meson-31f00c11d32eff4b31516f4425f755f615ee6594.tar.gz
meson-31f00c11d32eff4b31516f4425f755f615ee6594.tar.bz2
summary: Fix empty list case
Fixes: #6557.
-rw-r--r--mesonbuild/interpreter.py2
-rwxr-xr-xrun_unittests.py1
-rw-r--r--test cases/unit/72 summary/meson.build1
3 files changed, 4 insertions, 0 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index 8a04842..0d87bab 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -1783,6 +1783,8 @@ class Summary:
formatted_values.append(mlog.green('YES') if i else mlog.red('NO'))
else:
formatted_values.append(i)
+ if not formatted_values:
+ formatted_values = ['']
self.sections[section][k] = formatted_values
self.max_key_len = max(self.max_key_len, len(k))
diff --git a/run_unittests.py b/run_unittests.py
index 5388679..cf40955 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -4254,6 +4254,7 @@ recommended as it is not supported on some platforms''')
A list: string
1
True
+ empty list:
A number: 1
yes: YES
no: NO
diff --git a/test cases/unit/72 summary/meson.build b/test cases/unit/72 summary/meson.build
index c6d94d9..c155889 100644
--- a/test cases/unit/72 summary/meson.build
+++ b/test cases/unit/72 summary/meson.build
@@ -7,6 +7,7 @@ summary({'Some boolean': false,
'Another boolean': true,
'Some string': 'Hello World',
'A list': ['string', 1, true],
+ 'empty list': [],
}, section: 'Configuration')
summary('A number', 1, section: 'Configuration')
summary('yes', true, bool_yn : true, section: 'Configuration')