From: Johan Dahlin <jdahlin@async.com.br>
Date: Sun, 30 Nov 2008 13:05:52 +0000 (+0000)
Subject: Bug 562289 – Race when removing invalid cache
X-Git-Tag: GOBJECT_INTROSPECTION_0_6_2~68
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=381c42be6df69deca5ef51a8e3de63d3aad940d2;p=platform%2Fupstream%2Fgobject-introspection.git

Bug 562289 – Race when removing invalid cache

2008-11-30  Johan Dahlin  <jdahlin@async.com.br>

        Bug 562289 – Race when removing invalid cache

        * giscanner/cachestore.py:
        ENOENT is mapped to a OSError, not IOError.


svn path=/trunk/; revision=979
---

diff --git a/ChangeLog b/ChangeLog
index ca82d60..d44a0fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-30  Johan Dahlin  <jdahlin@async.com.br>
+
+	Bug 562289 – Race when removing invalid cache
+
+	* giscanner/cachestore.py:
+	ENOENT is mapped to a OSError, not IOError.
+
 2008-11-27  Johan Dahlin  <jdahlin@async.com.br>
 
 	* gir/glib-2.0.c: Add return value transfer annotation
diff --git a/giscanner/cachestore.py b/giscanner/cachestore.py
index bd3d864..d7d7b4f 100644
--- a/giscanner/cachestore.py
+++ b/giscanner/cachestore.py
@@ -68,8 +68,11 @@ class CacheStore(object):
             # Permission denied
             if e.errno == errno.EACCES:
                 return
+            else:
+                raise
+	except OSError, e:
             # File does not exist
-            elif e.errno == errno.ENOENT:
+            if e.errno == errno.ENOENT:
                 return
             else:
                 raise