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

This commit is contained in:
Serge Gautherie 2012-01-25 14:22:28 +01:00
Родитель b96c88fef5
Коммит b2a60be0c5
1 изменённых файлов: 6 добавлений и 5 удалений

Просмотреть файл

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