summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGarrett Regier <garrett.regier@riftio.com>2015-03-14 23:20:21 -0700
committerDieter Verfaillie <dieterv@optionexplicit.be>2015-04-19 22:01:12 +0200
commitcc6ef77db3dabae8ac56922e47fcfa39c599868b (patch)
tree69413cd70706937bcd58da40121b459559b37689
parent90f69635057171b45cccb785fc1c53ccc992e0c3 (diff)
downloadgobject-introspection-cc6ef77db3dabae8ac56922e47fcfa39c599868b.tar.gz
scanner: Don't fail when GI_SCANNER_DISABLE_CACHE is set
It was assumed that cache store was always working, this also removes a round trip to the cache store. So performance should also get a small boost. https://bugzilla.gnome.org/show_bug.cgi?id=746231 Signed-off-by: Garrett Regier <garrett.regier@riftio.com>
-rw-r--r--giscanner/transformer.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/giscanner/transformer.py b/giscanner/transformer.py
index 8c5e9087..b8bdfba2 100644
--- a/giscanner/transformer.py
+++ b/giscanner/transformer.py
@@ -200,8 +200,7 @@ None."""
if extra_include_dirs is not None:
self.set_include_paths(extra_include_dirs)
self.set_passthrough_mode()
- self._parse_include(filename)
- parser = self._cachestore.load(filename)
+ parser = self._parse_include(filename)
self._namespace = parser.get_namespace()
del self._parsed_includes[self._namespace.name]
return self
@@ -226,6 +225,7 @@ None."""
self._pkg_config_packages.add(pkg)
namespace = parser.get_namespace()
self._parsed_includes[namespace.name] = namespace
+ return parser
def _iter_namespaces(self):
"""Return an iterator over all included namespaces; the