Fix --include-uninstalled
authorColin Walters <walters@verbum.org>
Tue, 28 Sep 2010 22:16:53 +0000 (18:16 -0400)
committerColin Walters <walters@verbum.org>
Tue, 28 Sep 2010 22:16:53 +0000 (18:16 -0400)
Somehow, this regressed; i have no idea how.  We need to be
comparing Include objects, not string versus Include.

giscanner/transformer.py

index acf0df8..f07e8d1 100644 (file)
@@ -51,8 +51,8 @@ class Transformer(object):
         self._namespace = namespace
         self._pkg_config_packages = set()
         self._typedefs_ns = {}
-        self._includes = {}
-        self._include_names = set()
+        self._includes = {} # <string namespace -> Namespace>
+        self._include_names = set() # string namespace
         self._includepaths = []
         self._passthrough_mode = False
 
@@ -131,7 +131,7 @@ class Transformer(object):
 "Include path %r must be a filename path ending in .gir" % (include_path, ))
         girname = basename[:-4]
         include = ast.Include.from_string(girname)
-        if girname in self._include_names:
+        if include in self._include_names:
             return
         self._parse_include(include_path, uninstalled=True)
         self._include_names.add(include)