2017-03-23 17:26:00

1 files changed, 10 insertions, 6 deletions

diff --git a/tex/context/base/mkiv/util-lib.lua b/tex/context/base/mkiv/util-lib.lua
index 98c417b8e..90a06f109 100644
--- a/tex/context/base/mkiv/util-lib.lua
+++ b/tex/context/base/mkiv/util-lib.lua
@@ -100,15 +100,15 @@ local function locate(required,version,trace,report,action)
         report("requiring library %a with version %a",required,version or "any")
     end
     local found_library = nil
+    local required_full = gsub(required,"%.","/") -- package.helpers.lualibfile
+    local required_path = pathpart(required_full)
+    local required_base = nameonly(required_full)
     if qualifiedpath(required) then
         if isfile(required) then
             found_library = required
         end
     else
         -- initialize a few variables
-        local required_full = gsub(required,"%.","/") -- package.helpers.lualibfile
-        local required_path = pathpart(required_full)
-        local required_base = nameonly(required_full)
         local required_name = required_base .. "." .. os.libsuffix
         local version       = type(version) == "string" and version ~= "" and version or false
         local engine        = environment.ownmain or false
@@ -233,6 +233,10 @@ do
     local trace_swiglib  = false
     local savedrequire   = require
     local loadedlibs     = { }
+    local loadlib        = package.loadlib
+
+    local pushdir = dir.push
+    local popdir  = dir.pop
 
     trackers.register("resolvers.swiglib", function(v) trace_swiglib = v end)
 
@@ -241,9 +245,9 @@ do
         if library == nil then
             local trace_swiglib = trace_swiglib or package.helpers.trace
             library = locate(required,version,trace_swiglib,report_swiglib,function(name,base)
-                dir.push(pathpart(name))
+                pushdir(pathpart(name))
                 local opener  = "luaopen_" .. base
-                local library, message = package.loadlib(name,opener)
+                local library, message = loadlib(name,opener)
                 local libtype = type(library)
                 if libtype == "function" then
                     library = library()
@@ -252,7 +256,7 @@ do
                     report_swiglib("load error: %a returns %a, message %a, library %a",opener,libtype,(string.gsub(message or "no message","[%s]+$","")),found_library or "no library")
                     library = false
                 end
-                dir.pop()
+                popdir()
                 return message, library
             end)
             loadedlibs[required] = library or false