From f1b0fea5a84d36326f456643d54368a4ab0a7040 Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg42.2a@gmail.com>
Date: Fri, 3 Jan 2014 18:14:20 +0100
Subject: [db] handle missing metadata table

Fixes issue #164, hopefully.
---
 luaotfload-database.lua | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/luaotfload-database.lua b/luaotfload-database.lua
index b47fc8b..535aa7e 100644
--- a/luaotfload-database.lua
+++ b/luaotfload-database.lua
@@ -574,7 +574,16 @@ load_names = function (dry_run)
         report ("info", 3, "db", "Loading took %0.f ms.",
                 1000 * (osgettimeofday () - starttime))
 
-        local db_version, nms_version = data.meta.version, names.version
+        local db_version, nms_version
+        if data.meta then
+            db_version = data.meta.version
+        else
+            --- Compatibility branch; the version info used to be
+            --- stored in the table root which is why updating from
+            --- an earlier index version broke.
+            db_version = data.version or -42 --- invalid
+        end
+        nms_version = names.version
         if db_version ~= nms_version then
             report ("both", 0, "db",
                     [[Version mismatch; expected %4.3f, got %4.3f.]],
-- 
cgit v1.2.3


From 5b26498993e9e0e9ba4759ceb3976b17f42d1413 Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg42.2a@gmail.com>
Date: Fri, 3 Jan 2014 18:17:16 +0100
Subject: [db] fix incorrect local

---
 luaotfload-database.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/luaotfload-database.lua b/luaotfload-database.lua
index 535aa7e..9d7d912 100644
--- a/luaotfload-database.lua
+++ b/luaotfload-database.lua
@@ -83,7 +83,7 @@ local tableconcat              = table.concat
 local tablesort                = table.sort
 local utf8gsub                 = unicode.utf8.gsub
 local utf8lower                = unicode.utf8.lower
-local utf8length               = unicode.utf8.length
+local utf8len                  = unicode.utf8.len
 local zlibcompress             = zlib.compress
 
 --- these come from Lualibs/Context
@@ -2127,7 +2127,7 @@ end
 local truncate_string = function (str, restrict)
     local tw  = luaotfloadconfig.termwidth
     local wd  = tw - restrict
-    local len = utf8length (str)
+    local len = utf8len (str)
     if wd - len < 0 then
         --- combined length exceeds terminal,
         str = ".." .. stringsub(str, len - wd + 2)
-- 
cgit v1.2.3