l3build (15dec21)

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

2 files changed, 12 insertions, 11 deletions

diff --git a/Master/texmf-dist/scripts/l3build/l3build-variables.lua b/Master/texmf-dist/scripts/l3build/l3build-variables.lua
index ffabf3490a7..736df6ae826 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-variables.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-variables.lua
@@ -121,11 +121,13 @@ specialformats.context = specialformats.context or {
     pdftex = {binary = "texexec", format = ""},
     xetex  = {binary = "texexec", format = "", options = "--xetex"}
   }
-specialformats.latex = specialformats.latex or {
-    etex  = {format = "latex"},
-    ptex  = {binary = "eptex"},
-    uptex = {binary = "euptex"}
-  }
+specialformats.latex = specialformats.latex or { }
+specialformats.latex.etex = specialformats.latex.etex or
+  {format = "latex"}
+specialformats.latex.ptex = specialformats.latex.ptex or
+   {binary = "eptex"}
+specialformats.latex.uptex = specialformats.latex.uptex or
+  {binary = "euptex"}
 if not string.find(status.banner,"2019") then
   specialformats.latex.luatex = specialformats.latex.luatex or
     {binary = "luahbtex",format = "lualatex"}
diff --git a/Master/texmf-dist/scripts/l3build/l3build.lua b/Master/texmf-dist/scripts/l3build/l3build.lua
index 1d8d58c6946..9c811c3fc87 100755
--- a/Master/texmf-dist/scripts/l3build/l3build.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build.lua
@@ -25,7 +25,7 @@ for those people who are interested.
 --]]
 
 -- Version information
-release_date = "2021-12-09"
+release_date = "2021-12-14"
 
 -- File operations are aided by the LuaFileSystem module
 local lfs = require("lfs")
@@ -136,11 +136,10 @@ end
 if #checkconfigs > 1 then
   if options["target"] == "check" then
     local errorlevel = 0
-    local opts = options
     local failed = { }
     for i = 1, #checkconfigs do
-      opts["config"] = {checkconfigs[i]}
-      errorlevel = call({"."}, "check", opts)
+      options["config"] = {checkconfigs[i]}
+      errorlevel = call({"."}, "check", options)
       if errorlevel ~= 0 then
         if options["halt-on-error"] then
           exit(1)
@@ -199,8 +198,8 @@ if #checkconfigs > 1 then
   elseif options["target"] == "clean" then
     local failure
     for i = 1, #checkconfigs do
-      opts["config"] = {checkconfigs[i]}
-      failure = 0 ~= call({"."}, "clean", opts) or failure
+      options["config"] = {checkconfigs[i]}
+      failure = 0 ~= call({"."}, "clean", options) or failure
     end
     exit(failure and 1 or 0)
   end