2017-06-19 15:35:00

4 files changed, 48 insertions, 36 deletions

diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua
index cf46273ca..a011ce9bb 100644
--- a/scripts/context/lua/mtxrun.lua
+++ b/scripts/context/lua/mtxrun.lua
@@ -19963,7 +19963,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-lib"] = package.loaded["util-lib"] or true
 
--- original size: 14040, stripped down to: 7818
+-- original size: 14131, stripped down to: 7859
 
 if not modules then modules={} end modules ['util-lib']={
   version=1.001,
@@ -20115,10 +20115,12 @@ local function locate(required,version,trace,report,action)
       report("load error: message %a, library %a",tostring(message or "unknown"),found_library or "no library")
     end
   end
-  if not library then
-    report("unknown library: %a",required)
-  elseif trace then
-    report("stored library: %a",required)
+  if trace then
+    if not library then
+      report("unknown library: %a",required)
+    else
+      report("stored library: %a",required)
+    end
   end
   return library
 end
@@ -20215,10 +20217,11 @@ if FFISUPPORTED and ffi and ffi.load then
     local library=ffilib(name)
     if type(library)=="userdata" then
       return library
-    else
+    end
+    if trace_ffilib then
       report_ffilib("trying to load %a using normal loader",name)
-      return savedffiload(name)
     end
+    return savedffiload(name)
   end
 end
 
@@ -20564,8 +20567,8 @@ end -- of closure
 
 -- used libraries    : l-lua.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 846131
--- stripped bytes    : 306161
+-- original bytes    : 846222
+-- stripped bytes    : 306211
 
 -- end library merge
 
diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua
index cf46273ca..a011ce9bb 100644
--- a/scripts/context/stubs/mswin/mtxrun.lua
+++ b/scripts/context/stubs/mswin/mtxrun.lua
@@ -19963,7 +19963,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-lib"] = package.loaded["util-lib"] or true
 
--- original size: 14040, stripped down to: 7818
+-- original size: 14131, stripped down to: 7859
 
 if not modules then modules={} end modules ['util-lib']={
   version=1.001,
@@ -20115,10 +20115,12 @@ local function locate(required,version,trace,report,action)
       report("load error: message %a, library %a",tostring(message or "unknown"),found_library or "no library")
     end
   end
-  if not library then
-    report("unknown library: %a",required)
-  elseif trace then
-    report("stored library: %a",required)
+  if trace then
+    if not library then
+      report("unknown library: %a",required)
+    else
+      report("stored library: %a",required)
+    end
   end
   return library
 end
@@ -20215,10 +20217,11 @@ if FFISUPPORTED and ffi and ffi.load then
     local library=ffilib(name)
     if type(library)=="userdata" then
       return library
-    else
+    end
+    if trace_ffilib then
       report_ffilib("trying to load %a using normal loader",name)
-      return savedffiload(name)
     end
+    return savedffiload(name)
   end
 end
 
@@ -20564,8 +20567,8 @@ end -- of closure
 
 -- used libraries    : l-lua.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 846131
--- stripped bytes    : 306161
+-- original bytes    : 846222
+-- stripped bytes    : 306211
 
 -- end library merge
 
diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun
index cf46273ca..a011ce9bb 100644
--- a/scripts/context/stubs/unix/mtxrun
+++ b/scripts/context/stubs/unix/mtxrun
@@ -19963,7 +19963,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-lib"] = package.loaded["util-lib"] or true
 
--- original size: 14040, stripped down to: 7818
+-- original size: 14131, stripped down to: 7859
 
 if not modules then modules={} end modules ['util-lib']={
   version=1.001,
@@ -20115,10 +20115,12 @@ local function locate(required,version,trace,report,action)
       report("load error: message %a, library %a",tostring(message or "unknown"),found_library or "no library")
     end
   end
-  if not library then
-    report("unknown library: %a",required)
-  elseif trace then
-    report("stored library: %a",required)
+  if trace then
+    if not library then
+      report("unknown library: %a",required)
+    else
+      report("stored library: %a",required)
+    end
   end
   return library
 end
@@ -20215,10 +20217,11 @@ if FFISUPPORTED and ffi and ffi.load then
     local library=ffilib(name)
     if type(library)=="userdata" then
       return library
-    else
+    end
+    if trace_ffilib then
       report_ffilib("trying to load %a using normal loader",name)
-      return savedffiload(name)
     end
+    return savedffiload(name)
   end
 end
 
@@ -20564,8 +20567,8 @@ end -- of closure
 
 -- used libraries    : l-lua.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 846131
--- stripped bytes    : 306161
+-- original bytes    : 846222
+-- stripped bytes    : 306211
 
 -- end library merge
 
diff --git a/scripts/context/stubs/win64/mtxrun.lua b/scripts/context/stubs/win64/mtxrun.lua
index cf46273ca..a011ce9bb 100644
--- a/scripts/context/stubs/win64/mtxrun.lua
+++ b/scripts/context/stubs/win64/mtxrun.lua
@@ -19963,7 +19963,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-lib"] = package.loaded["util-lib"] or true
 
--- original size: 14040, stripped down to: 7818
+-- original size: 14131, stripped down to: 7859
 
 if not modules then modules={} end modules ['util-lib']={
   version=1.001,
@@ -20115,10 +20115,12 @@ local function locate(required,version,trace,report,action)
       report("load error: message %a, library %a",tostring(message or "unknown"),found_library or "no library")
     end
   end
-  if not library then
-    report("unknown library: %a",required)
-  elseif trace then
-    report("stored library: %a",required)
+  if trace then
+    if not library then
+      report("unknown library: %a",required)
+    else
+      report("stored library: %a",required)
+    end
   end
   return library
 end
@@ -20215,10 +20217,11 @@ if FFISUPPORTED and ffi and ffi.load then
     local library=ffilib(name)
     if type(library)=="userdata" then
       return library
-    else
+    end
+    if trace_ffilib then
       report_ffilib("trying to load %a using normal loader",name)
-      return savedffiload(name)
     end
+    return savedffiload(name)
   end
 end
 
@@ -20564,8 +20567,8 @@ end -- of closure
 
 -- used libraries    : l-lua.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 846131
--- stripped bytes    : 306161
+-- original bytes    : 846222
+-- stripped bytes    : 306211
 
 -- end library merge