X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=fc-cache%2Ffc-cache.c;h=8519388cf37576021876ff8c321cc69a826cc9cc;hb=7410e40bd93beb4ab1a577d084112413431cede2;hp=5e4ada40c0ad91eaa49457e42d681b722cfef7ed;hpb=62a4a8459adaf26833e1dad0ee96ea5a4b8c3d54;p=fontconfig.git

diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c
index 5e4ada4..8519388 100644
--- a/fc-cache/fc-cache.c
+++ b/fc-cache/fc-cache.c
@@ -230,7 +230,8 @@ scanDirs (FcStrList *list, FcConfig *config, char *program, FcBool force, FcBool
 	    ret++;
 	    continue;
 	}
-	if (!force && FcDirCacheValid (dir) && FcDirCacheHasCurrentArch (dir))
+	if (!force && FcDirCacheValid (dir, config) && 
+	    FcDirCacheHasCurrentArch (dir, config))
 	{
 	    if (verbose)
 		printf ("skipping, %d fonts, %d dirs\n",
@@ -244,14 +245,12 @@ scanDirs (FcStrList *list, FcConfig *config, char *program, FcBool force, FcBool
 
 	    /* This is the only reason we can't combine 
 	     * Valid w/HasCurrentArch... */
-            if (!FcDirCacheValid (dir))
+            if (!FcDirCacheValid (dir, config))
                 if (!FcDirCacheUnlink (dir, config))
                     ret++;
 
 	    if (!FcDirSave (set, subdirs, dir))
 	    {
-                if (!ret)
-                    fprintf (stderr, "Caches are currently saved to \"%s\"\n", PKGCACHEDIR);
 		fprintf (stderr, "Can't save cache for \"%s\"\n", dir);
 		ret++;
 	    }