summaryrefslogtreecommitdiff
path: root/luaotfload-database.lua
diff options
context:
space:
mode:
authorPhilipp Gesang <phg42.2a@gmail.com>2013-08-31 21:39:42 +0200
committerPhilipp Gesang <phg42.2a@gmail.com>2013-08-31 21:39:42 +0200
commitc39f4e5ea942a88a319321b8cd546532300700dc (patch)
tree3ce22ad3a44c7d40504dcc8dc79d6f609a94ee33 /luaotfload-database.lua
parenta4c38dbe7fa31d7dbd2336a3290d366237621e46 (diff)
downloadluaotfload-c39f4e5ea942a88a319321b8cd546532300700dc.tar.gz
[db] correctly abort if timestamps match
Diffstat (limited to 'luaotfload-database.lua')
-rw-r--r--luaotfload-database.lua21
1 files changed, 13 insertions, 8 deletions
diff --git a/luaotfload-database.lua b/luaotfload-database.lua
index c46956d..6202079 100644
--- a/luaotfload-database.lua
+++ b/luaotfload-database.lua
@@ -431,7 +431,7 @@ load_names = function (dry_run)
report ("info", 3, "db", "Loading took %0.f ms",
1000*(os.gettimeofday()-starttime))
- local db_version, nms_version = data.version, names.version
+ local db_version, nms_version = data.meta.version, names.version
if db_version ~= nms_version then
report ("both", 0, "db",
[[Version mismatch; expected %4.3f, got %4.3f]],
@@ -1449,6 +1449,8 @@ local compare_timestamps = function (fullname,
return false
end
+
+ return true
end
@@ -1490,13 +1492,16 @@ local read_font_names = function (fullname,
return false
end
- local changed = compare_timestamps (fullname,
- currentstatus,
- currententrystatus,
- currentmappings,
- targetstatus,
- targetentrystatus,
- targetmappings)
+ if not compare_timestamps (fullname,
+ currentstatus,
+ currententrystatus,
+ currentmappings,
+ targetstatus,
+ targetentrystatus,
+ targetmappings)
+ then
+ return false
+ end
local loader = loaders[format] --- ot_fullinfo, t1_fullinfo
if not loader then