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

mesonlib: Add better errormessage to typelistify

This commit is contained in:
Dylan Baker 2021-01-21 11:53:09 -08:00
parent 80ec157e5e
commit 9cebd29da9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/ciimage/ubuntu-rolling/install.sh
View File

@ -27,7 +27,7 @@ pkgs=(
libblocksruntime-dev libblocksruntime-dev
libperl-dev libperl-dev
liblapack-dev libscalapack-mpi-dev liblapack-dev libscalapack-mpi-dev
rust-bindgen bindgen
) )
sed -i '/^#\sdeb-src /s/^#//' "/etc/apt/sources.list" sed -i '/^#\sdeb-src /s/^#//' "/etc/apt/sources.list"

4
mesonbuild/mesonlib/universal.py
View File

@ -1262,10 +1262,10 @@ def typeslistify(item: 'T.Union[_T, T.Sequence[_T]]',
if isinstance(item, types): if isinstance(item, types):
item = T.cast(T.List[_T], [item]) item = T.cast(T.List[_T], [item])
if not isinstance(item, list): 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: for i in item:
if i is not None and not isinstance(i, types): 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 return item