Bug 720955. (Av1) xpt.py: Report IIDs when they differ. r=ted.mielczarek.
authorSerge Gautherie <sgautherie.bz@free.fr>
Wed, 25 Jan 2012 14:22:28 +0100
changeset 86438 03ae304e45afdc7e6f4f0db9201659faeba4deaf
parent 86437 69d3ab27a237176169e328f52437417a4edc2e31
child 86558 0d5ad6a6f814daabf70822accbdcd05619b4bcd5
push id805
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 18:17:35 +0000
treeherdermozilla-aurora@6fb3bf232436 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs720955
milestone12.0a1
Bug 720955. (Av1) xpt.py: Report IIDs when they differ. r=ted.mielczarek.
xpcom/typelib/xpt/tools/xpt.py
--- a/xpcom/typelib/xpt/tools/xpt.py
+++ b/xpcom/typelib/xpt/tools/xpt.py
@@ -1205,24 +1205,25 @@ class Typelib(object):
                         elif i.iid == Interface.UNRESOLVED_IID:
                             # keep j
                             merged_interfaces.append((i, j))
                             merged = True
                             # Fixup will happen after processing all interfaces.
                         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)
         # Now fixup any merged interfaces
         def checkType(t, replaced_from, replaced_to):
             if isinstance(t, InterfaceType) and t.iface == replaced_from:
                 t.iface = replaced_to
             elif isinstance(t, ArrayType) and \