luaotfload (17jul14)

git-svn-id: svn://tug.org/texlive/trunk@34644 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 5 insertions, 4 deletions

diff --git a/Master/texmf-dist/scripts/luaotfload/luaotfload-tool.lua b/Master/texmf-dist/scripts/luaotfload/luaotfload-tool.lua
index 4c5550891b2..89f5483b6a3 100755
--- a/Master/texmf-dist/scripts/luaotfload/luaotfload-tool.lua
+++ b/Master/texmf-dist/scripts/luaotfload/luaotfload-tool.lua
@@ -6,11 +6,11 @@
 --       AUTHOR:  Khaled Hosny, Élie Roux, Philipp Gesang
 --      VERSION:  2.5
 --      LICENSE:  GPL v2.0
---     MODIFIED:  2014-05-15 21:47:39+0200
+--     MODIFIED:  2014-07-16 19:45:40+0200
 -----------------------------------------------------------------------
 
 luaotfload          = luaotfload or { }
-local version       = "2.5" --- <int: major>.<int: minor>-<int: fixes>
+local version       = "2.5-1" --- <int: major>.<int: minor>-<int: fixes>
 luaotfload.version  = version
 luaotfload.self     = "luaotfload-tool"
 
diff --git a/Master/texmf-dist/scripts/luaotfload/mkstatus b/Master/texmf-dist/scripts/luaotfload/mkstatus
index 15cb97cf207..802b2cd4555 100755
--- a/Master/texmf-dist/scripts/luaotfload/mkstatus
+++ b/Master/texmf-dist/scripts/luaotfload/mkstatus
@@ -128,7 +128,7 @@ hash_all = function (list, acc)
   local finfo = list[#list]
   list[#list] = nil
   if finfo then
-    local fpath
+    local fpath, fname
     if type (finfo) == "table" then
       local d, f = finfo [1], finfo [2]
       if lfs.isdir (d) then
@@ -136,6 +136,7 @@ hash_all = function (list, acc)
       else
         fpath = f
       end
+      fname = f
     else
       fpath = finfo
     end
@@ -149,7 +150,7 @@ hash_all = function (list, acc)
       iowrite (sum)
       iowrite "\"\n"
     end
-    acc[#acc+1] = { fpath, sum }
+    acc[#acc+1] = { fname, sum }
     return hash_all (list, acc)
   end
   return acc