yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-03-24 22:15:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

qapi: Improve 'include' error message

Browse source 
Use of '"...%s" % include' to print non-strings can lead to
ugly messages, such as this (if the .json change is applied
without the qapi.py change):
 Expected a file name (string), got: OrderedDict()

Better is to just omit the actual non-string value in the
message.

Backports commit 7408fb67c0f9403f6e40aecf97cf798fc14e2cd8 from qemu
This commit is contained in:
Eric Blake 2018-02-19 17:55:32 -05:00 committed by Lioncash
parent 02e411f666
commit de2b67e528
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
qemu/scripts/qapi.py
View file

@ -132,8 +132,7 @@ class QAPISchemaParser(object):
include = expr["include"] include = expr["include"]
if not isinstance(include, str): if not isinstance(include, str):
raise QAPIExprError(expr_info, raise QAPIExprError(expr_info,
'Expected a file name (string), got: %s' "Value of 'include' must be a string")
% include)
incl_abs_fname = os.path.join(os.path.dirname(abs_fname), incl_abs_fname = os.path.join(os.path.dirname(abs_fname),
include) include)
# catch inclusion cycle # catch inclusion cycle