commit 50544b13c19c6a4a9fe9cf26cdd2170ddacf86d1
author Patrick Lam <plam@MIT.EDU> Fri Nov 04 16:48:32 2005 +0000
committer Patrick Lam <plam@MIT.EDU> Fri Nov 04 16:48:32 2005 +0000
tree 841d4b8de6e9d5e5d2429296eca50b39bbf5e848
parent e6d3e251ee26f1267585cbbd5a95dc1f7290e225

Add test for validity of directory caches that somehow got lost (reported
    by make distcheck).

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index d067f45..2d26433 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
 2005-11-04  Patrick Lam  <plam@mit.edu>
+	* src/fcdir.c (FcDirScanConfig):
+
+	Add test for validity of directory caches that
+	somehow got lost (reported by make distcheck).
+
+2005-11-04  Patrick Lam  <plam@mit.edu>
 	* ChangeLog:
 	* README:
 	* configure.in:

src/fcdir.c

diff --git a/src/fcdir.c b/src/fcdir.c
index 3b9d23f..5452b60 100644
--- a/src/fcdir.c
+++ b/src/fcdir.c
@@ -139,7 +139,7 @@
 	if (cache && FcGlobalCacheReadDir (set, dirs, cache, (char *)dir, config))
 	    return FcTrue;
 
-	if (FcDirCacheRead (set, dirs, dir))
+	if (FcDirCacheValid (dir) && FcDirCacheRead (set, dirs, dir))
 	    return FcTrue;
     }