Commit dd21876e authored by Akira TAGOH's avatar Akira TAGOH

Update .uuid only when -r is given but not -f.

parent dd1a9291
...@@ -188,7 +188,10 @@ scanDirs (FcStrList *list, FcConfig *config, FcBool force, FcBool really_force, ...@@ -188,7 +188,10 @@ scanDirs (FcStrList *list, FcConfig *config, FcBool force, FcBool really_force,
was_processed = FcTrue; was_processed = FcTrue;
if (really_force) if (really_force)
{
FcDirCacheUnlink (dir, config); FcDirCacheUnlink (dir, config);
FcDirCacheCreateUUID ((FcChar8 *) dir, FcTrue, config);
}
cache = NULL; cache = NULL;
was_valid = FcFalse; was_valid = FcFalse;
......
...@@ -371,6 +371,11 @@ FcDirCacheClean (const FcChar8 *cache_dir, FcBool verbose); ...@@ -371,6 +371,11 @@ FcDirCacheClean (const FcChar8 *cache_dir, FcBool verbose);
FcPublic void FcPublic void
FcCacheCreateTagFile (const FcConfig *config); FcCacheCreateTagFile (const FcConfig *config);
FcPublic FcBool
FcDirCacheCreateUUID (FcChar8 *dir,
FcBool force,
FcConfig *config);
/* fccfg.c */ /* fccfg.c */
FcPublic FcChar8 * FcPublic FcChar8 *
FcConfigHome (void); FcConfigHome (void);
......
...@@ -409,7 +409,7 @@ FcDirCacheRead (const FcChar8 *dir, FcBool force, FcConfig *config) ...@@ -409,7 +409,7 @@ FcDirCacheRead (const FcChar8 *dir, FcBool force, FcConfig *config)
{ {
FcCache *cache = NULL; FcCache *cache = NULL;
FcDirCacheCreateUUID ((FcChar8 *) dir, force, config); FcDirCacheCreateUUID ((FcChar8 *) dir, FcFalse, config);
/* Try to use existing cache file */ /* Try to use existing cache file */
if (!force) if (!force)
cache = FcDirCacheLoad (dir, config, NULL); cache = FcDirCacheLoad (dir, config, NULL);
......
...@@ -596,11 +596,6 @@ struct _FcValuePromotionBuffer { ...@@ -596,11 +596,6 @@ struct _FcValuePromotionBuffer {
/* fccache.c */ /* fccache.c */
FcPrivate FcBool
FcDirCacheCreateUUID (FcChar8 *dir,
FcBool force,
FcConfig *config);
FcPrivate FcCache * FcPrivate FcCache *
FcDirCacheScan (const FcChar8 *dir, FcConfig *config); FcDirCacheScan (const FcChar8 *dir, FcConfig *config);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment