wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 720955. (Av1) xpt.py: Report IIDs when they differ. r=ted.mielczarek.

Browse Source
This commit is contained in:
Serge Gautherie 2012-01-25 14:22:28 +01:00
parent 6ac7de5922
commit 894a8ab334
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
xpcom/typelib/xpt/tools/xpt.py
View File

@ -1210,14 +1210,15 @@ class Typelib(object):
else:
# Same name, different IIDs, raise an exception
raise DataError, \
"Typelibs contain definitions of interface %s"\
" with different IIDs!" % i.name
"Typelibs contain definitions of interface %s" \
" with different IIDs (%s vs %s)!" % \
(i.name, i.iid, j.iid)
elif i.iid == j.iid and i.iid != Interface.UNRESOLVED_IID:
# Same IID, different names, raise an exception
raise DataError, \
"Typelibs contain definitions of interface %s"\
" with different names (%s vs. %s)!" % \
(i.iid, i.name, j.name)
"Typelibs contain definitions of interface %s" \
" with different names (%s vs %s)!" % \
(i.iid, i.name, j.name)
if not merged:
# No partially matching interfaces, so just take this interface
self.interfaces.append(i)