aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2021-01-21 11:53:09 -0800
committerDylan Baker <dylan@pnwbakers.com>2021-02-06 10:27:04 -0800
commit9cebd29da973553c6e657f7b318ab1d6afbc76e6 (patch)
tree445bb8b953457268764cc6a66ed9bf6d38450fff
parent80ec157e5e02172cd6e2933bc1047fca07f176df (diff)
downloadmeson-9cebd29da973553c6e657f7b318ab1d6afbc76e6.zip
meson-9cebd29da973553c6e657f7b318ab1d6afbc76e6.tar.gz
meson-9cebd29da973553c6e657f7b318ab1d6afbc76e6.tar.bz2
mesonlib: Add better errormessage to typelistify
-rwxr-xr-xci/ciimage/ubuntu-rolling/install.sh2
-rw-r--r--mesonbuild/mesonlib/universal.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/ci/ciimage/ubuntu-rolling/install.sh b/ci/ciimage/ubuntu-rolling/install.sh
index 9a4c976..da31766 100755
--- a/ci/ciimage/ubuntu-rolling/install.sh
+++ b/ci/ciimage/ubuntu-rolling/install.sh
@@ -27,7 +27,7 @@ pkgs=(
libblocksruntime-dev
libperl-dev
liblapack-dev libscalapack-mpi-dev
- rust-bindgen
+ bindgen
)
sed -i '/^#\sdeb-src /s/^#//' "/etc/apt/sources.list"
diff --git a/mesonbuild/mesonlib/universal.py b/mesonbuild/mesonlib/universal.py
index 4b913a8..7deb24a 100644
--- a/mesonbuild/mesonlib/universal.py
+++ b/mesonbuild/mesonlib/universal.py
@@ -1262,10 +1262,10 @@ def typeslistify(item: 'T.Union[_T, T.Sequence[_T]]',
if isinstance(item, types):
item = T.cast(T.List[_T], [item])
if not isinstance(item, list):
- raise MesonException('Item must be a list or one of {!r}'.format(types))
+ raise MesonException('Item must be a list or one of {!r}, not {!r}'.format(types, type(item)))
for i in item:
if i is not None and not isinstance(i, types):
- raise MesonException('List item must be one of {!r}'.format(types))
+ raise MesonException('List item must be one of {!r}, not {!r}'.format(types, type(i)))
return item