[scanner] Print error instead of throwing for unknown include

We should avoid exceptions being propagated to the toplevel.

diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
index cc70fdee8f20669ca16a963303a85b7af38ca2d6..44c0287db7aab31d84b1c96e48a1e181a05bd8f0 100644 (file)
--- a/giscanner/scannermain.py
+++ b/giscanner/scannermain.py
@@ -276,7 +276,11 @@ def scanner_main(args):
     for include in options.includes:
         if os.sep in include:
             raise ValueError("Invalid include path %r" % (include, ))
-        include_obj = Include.from_string(include)
+        try:
+            include_obj = Include.from_string(include)
+        except:
+            sys.stderr.write("Malformed include %r\n" % (include, ))
+            sys.exit(1)
         transformer.register_include(include_obj)
 
     packages = set(options.packages)

diff --git a/giscanner/transformer.py b/giscanner/transformer.py
index f31408fa34c73b111e985730cf9453bce32a9448..2863e731c63608770443cbfab3eaaad4102562e2 100644 (file)
--- a/giscanner/transformer.py
+++ b/giscanner/transformer.py
@@ -18,7 +18,7 @@
 # Boston, MA 02111-1307, USA.
 #
 
-import os
+import os, sys
 
 from .ast import (Bitfield, Callback, Enum, Function, Namespace, Member,
                   Parameter, Return, Struct, Field,
@@ -125,8 +125,9 @@ class Transformer(object):
             path = os.path.join(d, girname)
             if os.path.exists(path):
                 return path
-        raise ValueError("Couldn't find include %r (search path: %r)"\
+        sys.stderr.write("Couldn't find include %r (search path: %r)\n"\
                          % (girname, searchdirs))
+        sys.exit(1)
 
     def _parse_include(self, filename):
         parser = self._cachestore.load(filename)