r25035 - in /packages/experimental/gobject-introspection/debian: changelog patches/02_giscanner_cache.patch patches/series

[bigon at users.alioth.debian.org]

Author: bigon
Date: Thu Aug 26 10:50:26 2010
New Revision: 25035

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25035
Log:
* Add debian/patches/02_giscanner_cache.patch:
  - Do not crash if cache dir not present (Taken from Ubuntu)

Added:
    packages/experimental/gobject-introspection/debian/patches/02_giscanner_cache.patch
Modified:
    packages/experimental/gobject-introspection/debian/changelog
    packages/experimental/gobject-introspection/debian/patches/series

Modified: packages/experimental/gobject-introspection/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gobject-introspection/debian/changelog?rev=25035&op=diff
==============================================================================
--- packages/experimental/gobject-introspection/debian/changelog [utf-8] (original)
+++ packages/experimental/gobject-introspection/debian/changelog [utf-8] Thu Aug 26 10:50:26 2010
@@ -8,8 +8,10 @@
     - Bump Standards-Version to 3.9.1 (no further changes)
   * debian/libgirepository1.0-1.symbols:
     - Fix symbols file and add new symbols
-
- -- Laurent Bigonville <bigon at debian.org>  Thu, 26 Aug 2010 12:17:30 +0200
+  * Add debian/patches/02_giscanner_cache.patch:
+    - Do not crash if cache dir not present (Taken from Ubuntu)
+
+ -- Laurent Bigonville <bigon at debian.org>  Thu, 26 Aug 2010 12:44:16 +0200
 
 gobject-introspection (0.6.15~git20100713-1) experimental; urgency=low
 

Added: packages/experimental/gobject-introspection/debian/patches/02_giscanner_cache.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gobject-introspection/debian/patches/02_giscanner_cache.patch?rev=25035&op=file
==============================================================================
--- packages/experimental/gobject-introspection/debian/patches/02_giscanner_cache.patch (added)
+++ packages/experimental/gobject-introspection/debian/patches/02_giscanner_cache.patch [utf-8] Thu Aug 26 10:50:26 2010
@@ -1,0 +1,27 @@
+From 9a24233bed0e64b34f47f78e094df918fc85dcaf Mon Sep 17 00:00:00 2001
+From: Robert Ancell <robert.ancell at canonical.com>
+Date: Thu, 12 Aug 2010 10:01:37 +1000
+Subject: [PATCH] Fix giscanner crash with no cache directory
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=626694
+
+---
+ giscanner/cachestore.py |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/giscanner/cachestore.py b/giscanner/cachestore.py
+index d839ef5..d72eee4 100644
+--- a/giscanner/cachestore.py
++++ b/giscanner/cachestore.py
+@@ -76,6 +76,9 @@ class CacheStore(object):
+         self._check_cache_version()
+ 
+     def _check_cache_version(self):
++        if self._directory is None:
++            return
++
+         current_hash = _get_versionhash()
+         version = os.path.join(self._directory, _CACHE_VERSION_FILENAME)
+         try:
+-- 
+1.7.1
+

Modified: packages/experimental/gobject-introspection/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gobject-introspection/debian/patches/series?rev=25035&op=diff
==============================================================================
--- packages/experimental/gobject-introspection/debian/patches/series [utf-8] (original)
+++ packages/experimental/gobject-introspection/debian/patches/series [utf-8] Thu Aug 26 10:50:26 2010
@@ -1,1 +1,2 @@
 01_fix_doc_building.diff
+02_giscanner_cache.patch