[Pkg-corba-commits] r215 - in /trunk/omniorb/debian: changelog patches/series patches/string_exceptions

[flub-guest at users.alioth.debian.org]

Author: flub-guest
Date: Mon Jul 26 22:30:57 2010
New Revision: 215

URL: http://svn.debian.org/wsvn/pkg-corba/?sc=1&rev=215
Log:
Change string exceptions into AssertionError instances

After talking with upstream it seems all the string exceptions left
are really in code-paths that should never happen and are therefore
logically just assertion errors.

Added:
    trunk/omniorb/debian/patches/string_exceptions
Modified:
    trunk/omniorb/debian/changelog
    trunk/omniorb/debian/patches/series

Modified: trunk/omniorb/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/changelog?rev=215&op=diff
==============================================================================
--- trunk/omniorb/debian/changelog (original)
+++ trunk/omniorb/debian/changelog Mon Jul 26 22:30:57 2010
@@ -7,6 +7,7 @@
   * Add the word "dummy" to the package description of transitional
     packages to silence lintian.
   * Add $remote_fs to Required-{Start|Stop} in nameserver initscript.
+  * Change string exceptions into AssertionError (closes: #585260).
 
  -- Floris Bruynooghe <floris.bruynooghe at gmail.com>  Wed, 14 Jul 2010 23:14:47 +0100
 

Modified: trunk/omniorb/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/patches/series?rev=215&op=diff
==============================================================================
--- trunk/omniorb/debian/patches/series (original)
+++ trunk/omniorb/debian/patches/series Mon Jul 26 22:30:57 2010
@@ -2,3 +2,4 @@
 revert_abi_breakage
 buildsys
 cos_stubs
+string_exceptions

Added: trunk/omniorb/debian/patches/string_exceptions
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/patches/string_exceptions?rev=215&op=file
==============================================================================
--- trunk/omniorb/debian/patches/string_exceptions (added)
+++ trunk/omniorb/debian/patches/string_exceptions Mon Jul 26 22:30:57 2010
@@ -1,0 +1,68 @@
+--- a/src/lib/omniORB/omniidl_be/cxx/ast.py
++++ b/src/lib/omniORB/omniidl_be/cxx/ast.py
+@@ -352,8 +352,8 @@
+             if enum not in values: return 0
+         return 1
+ 
+-    raise "exhaustiveMatch type="+repr(type)+ \
+-          " val="+repr(discrimvalue)
++    raise AssertionError("exhaustiveMatch type="+repr(type)+
++                         " val="+repr(discrimvalue))
+ 
+ 
+ # Return the base AST node after following all the typedef chains
+--- a/src/lib/omniORB/omniidl_be/cxx/dynskel/typecode.py
++++ b/src/lib/omniORB/omniidl_be/cxx/dynskel/typecode.py
+@@ -376,8 +376,8 @@
+ 
+     if isinstance(type, idltype.Base):
+         util.fatalError("Internal error generating TypeCode data")
+-        raise "Don't know how to generate TypeCode for Base kind = " +\
+-              repr(type.kind())
++        raise AssertionError("Don't know how to generate TypeCode for"
++			     "Base kind = " + repr(type.kind()))
+ 
+     if isinstance(type, idltype.String):
+         return prefix + "string_tc(" + str(type.bound()) + tctrack + ")"
+--- a/src/lib/omniORB/omniidl_be/cxx/impl/main.py
++++ b/src/lib/omniORB/omniidl_be/cxx/impl/main.py
+@@ -244,7 +244,7 @@
+                                        "::" + args)
+             else:
+                 util.fatalError("Internal error generating interface member")
+-                raise "No code for interface member: " + repr(c)
++                raise AssertionError("No code for interface member: "+repr(c))
+ 
+         # the class definition has no actual code...
+         defs = string.join(map(lambda x:x + ";\n", declarations), "")
+--- a/src/lib/omniORB/omniidl_be/cxx/types.py
++++ b/src/lib/omniORB/omniidl_be/cxx/types.py
+@@ -793,7 +793,7 @@
+         if d_T.void():
+             raise NotImplementedError("No such thing as a void _var type")
+ 
+-        raise "Unknown _var type, kind = " + str(d_T.kind())
++        raise AssertionError("Unknown _var type, kind = " + str(d_T.kind()))
+ 
+     def out(self, ident):
+         if self.is_basic_data_types():
+@@ -826,7 +826,8 @@
+         if d_T.enum() or d_T.void() or (self.is_basic_data_types()):
+             return ""
+ 
+-        raise "Don't know how to free type, kind = " + str(d_T.kind())
++        raise AssertionError("Don't know how to free type, kind = "
++			     + str(d_T.kind()))
+ 
+     def copy(self, src, dest, environment = None):
+         """Copies an entity from src to dest"""
+@@ -861,7 +862,8 @@
+         if d_T.enum() or self.is_basic_data_types():
+             return dest + " = " + src + ";"
+ 
+-        raise "Don't know how to copy type, kind = " + str(d_T.kind())
++        raise AssertionError("Don't know how to copy type, kind = "
++			     + str(d_T.kind()))
+                
+     def representable_by_int(self):
+         """representable_by_int(types.Type): boolean