yet another mtxrun fix for runtime-discovered files (it should really be done now)

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

23 files changed, 299 insertions, 368 deletions

diff --git a/Master/bin/alpha-linux/mtxrun b/Master/bin/alpha-linux/mtxrun
index 5fbc817e24a..8debdf95551 100755
--- a/Master/bin/alpha-linux/mtxrun
+++ b/Master/bin/alpha-linux/mtxrun
@@ -12135,7 +12135,7 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
                         end
                     end
                 end
-                if not done and doscan then
+                if not done then
                     -- check if on disk / unchecked / does not work at all / also zips
                     -- TH perhaps it did not work because of missing resolvers.resolve() 
                     -- and resolvers.scanfiles() calls ...
@@ -12146,22 +12146,19 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
                         if not find(pname,"%*") then
                             local ppname = gsub(pname,"/+$","")
                             if can_be_dir(ppname) then
-                                local files = resolvers.scanfiles(ppname)
-                                if files then 
-                                    for k=1,#wantedfiles do
-                                        local w = wantedfiles[k]
-                                        local subpath = files[w]
-                                        if subpath then
-                                            local fname = filejoin(ppname,subpath,w)
-                                            if isreadable(fname) then
-                                                if trace_detail then
-                                                    report_resolving("found '%s' by scanning",fname)
-                                                end
-                                                result[#result+1] = fname
-                                                done = true
-                                                if not allresults then break end
-                                            end
+                                local files = {}
+                                if doscan then files = resolvers.scanfiles(ppname) end
+                                for k=1,#wantedfiles do
+                                    local w = wantedfiles[k]
+                                    local subpath = files[w] or ''
+                                    local fname = filejoin(ppname,subpath,w)
+                                    if isreadable(fname) then
+                                        if trace_detail then
+                                            report_resolving("found '%s' by scanning",fname)
                                         end
+                                        result[#result+1] = fname
+                                        done = true
+                                        if not allresults then break end
                                     end
                                 end
                             else
diff --git a/Master/bin/amd64-freebsd/mtxrun b/Master/bin/amd64-freebsd/mtxrun
index 5fbc817e24a..8debdf95551 100755
--- a/Master/bin/amd64-freebsd/mtxrun
+++ b/Master/bin/amd64-freebsd/mtxrun
@@ -12135,7 +12135,7 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
                         end
                     end
                 end
-                if not done and doscan then
+                if not done then
                     -- check if on disk / unchecked / does not work at all / also zips
                     -- TH perhaps it did not work because of missing resolvers.resolve() 
                     -- and resolvers.scanfiles() calls ...
@@ -12146,22 +12146,19 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
                         if not find(pname,"%*") then
                             local ppname = gsub(pname,"/+$","")
                             if can_be_dir(ppname) then
-                                local files = resolvers.scanfiles(ppname)
-                                if files then 
-                                    for k=1,#wantedfiles do
-                                        local w = wantedfiles[k]
-                                        local subpath = files[w]
-                                        if subpath then
-                                            local fname = filejoin(ppname,subpath,w)
-                                            if isreadable(fname) then
-                                                if trace_detail then
-                                                    report_resolving("found '%s' by scanning",fname)
-                                                end
-                                                result[#result+1] = fname
-                                                done = true
-                                                if not allresults then break end
-                                            end
+                                local files = {}
+                                if doscan then files = resolvers.scanfiles(ppname) end
+                                for k=1,#wantedfiles do
+                                    local w = wantedfiles[k]
+                                    local subpath = files[w] or ''
+                                    local fname = filejoin(ppname,subpath,w)
+                                    if isreadable(fname) then
+                                        if trace_detail then
+                                            report_resolving("found '%s' by scanning",fname)
                                         end
+                                        result[#result+1] = fname
+                                        done = true
+                                        if not allresults then break end
                                     end
                                 end
                             else
diff --git a/Master/bin/amd64-kfreebsd/mtxrun b/Master/bin/amd64-kfreebsd/mtxrun
index 5fbc817e24a..8debdf95551 100755
--- a/Master/bin/amd64-kfreebsd/mtxrun
+++ b/Master/bin/amd64-kfreebsd/mtxrun
@@ -12135,7 +12135,7 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
                         end
                     end
                 end
-                if not done and doscan then
+                if not done then
                     -- check if on disk / unchecked / does not work at all / also zips
                     -- TH perhaps it did not work because of missing resolvers.resolve() 
                     -- and resolvers.scanfiles() calls ...
@@ -12146,22 +12146,19 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
                         if not find(pname,"%*") then
                             local ppname = gsub(pname,"/+$","")
                             if can_be_dir(ppname) then
-                                local files = resolvers.scanfiles(ppname)
-                                if files then 
-                                    for k=1,#wantedfiles do
-                                        local w = wantedfiles[k]
-                                        local subpath = files[w]
-                                        if subpath then
-                                            local fname = filejoin(ppname,subpath,w)
-                                            if isreadable(fname) then
-                                                if trace_detail then
-                                                    report_resolving("found '%s' by scanning",fname)
-                                                end
-                                                result[#result+1] = fname
-                                                done = true
-                                                if not allresults then break end
-                                            end
+                                local files = {}
+                                if doscan then files = resolvers.scanfiles(ppname) end
+                                for k=1,#wantedfiles do
+                                    local w = wantedfiles[k]
+                                    local subpath = files[w] or ''
+                                    local fname = filejoin(ppname,subpath,w)
+                                    if isreadable(fname) then
+                                        if trace_detail then
+                                            report_resolving("found '%s' by scanning",fname)
                                         end
+                                        result[#result+1] = fname
+                                        done = true
+                                        if not allresults then break end
                                     end
                                 end
                             else
diff --git a/Master/bin/i386-cygwin/mtxrun b/Master/bin/i386-cygwin/mtxrun
index 5fbc817e24a..8debdf95551 100755
--- a/Master/bin/i386-cygwin/mtxrun
+++ b/Master/bin/i386-cygwin/mtxrun
@@ -12135,7 +12135,7 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
                         end
                     end
                 end
-                if not done and doscan then
+                if not done then
                     -- check if on disk / unchecked / does not work at all / also zips
                     -- TH perhaps it did not work because of missing resolvers.resolve() 
                     -- and resolvers.scanfiles() calls ...
@@ -12146,22 +12146,19 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
                         if not find(pname,"%*") then
                             local ppname = gsub(pname,"/+$","")
                             if can_be_dir(ppname) then
-                                local files = resolvers.scanfiles(ppname)
-                                if files then 
-                                    for k=1,#wantedfiles do
-                                        local w = wantedfiles[k]
-                                        local subpath = files[w]
-                                        if subpath then
-                                            local fname = filejoin(ppname,subpath,w)
-                                            if isreadable(fname) then
-                                                if trace_detail then
-                                                    report_resolving("found '%s' by scanning",fname)
-                                                end
-                                                result[#result+1] = fname
-                                                done = true
-                                                if not allresults then break end
-                                            end
+                                local files = {}
+                                if doscan then files = resolvers.scanfiles(ppname) end
+                                for k=1,#wantedfiles do
+                                    local w = wantedfiles[k]
+                                    local subpath = files[w] or ''
+                                    local fname = filejoin(ppname,subpath,w)
+                                    if isreadable(fname) then
+                                        if trace_detail then
+                                            report_resolving("found '%s' by scanning",fname)
                                         end
+                                        result[#result+1] = fname
+                                        done = true
+                                        if not allresults then break end
                                     end
                                 end
                             else
diff --git a/Master/bin/i386-freebsd/mtxrun b/Master/bin/i386-freebsd/mtxrun
index 5fbc817e24a..8debdf95551 100755
--- a/Master/bin/i386-freebsd/mtxrun
+++ b/Master/bin/i386-freebsd/mtxrun
@@ -12135,7 +12135,7 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
                         end
                     end
                 end
-                if not done and doscan then
+                if not done then
                     -- check if on disk / unchecked / does not work at all / also zips
                     -- TH perhaps it did not work because of missing resolvers.resolve() 
                     -- and resolvers.scanfiles() calls ...
@@ -12146,22 +12146,19 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
                         if not find(pname,"%*") then
                             local ppname = gsub(pname,"/+$","")
                             if can_be_dir(ppname) then
-                                local files = resolvers.scanfiles(ppname)
-                                if files then 
-                                    for k=1,#wantedfiles do
-                                        local w = wantedfiles[k]
-                                        local subpath = files[w]
-                                        if subpath then
-                                            local fname = filejoin(ppname,subpath,w)
-                                            if isreadable(fname) then
-                                                if trace_detail then
-                                                    report_resolving("found '%s' by scanning",fname)
-                                                end
-                                                result[#result+1] = fname
-                                                done = true
-                                                if not allresults then break end
-                                            end
+                                local files = {}
+                                if doscan then files = resolvers.scanfiles(ppname) end
+                                for k=1,#wantedfiles do
+                                    local w = wantedfiles[k]
+                                    local subpath = files[w] or ''
+                                    local fname = filejoin(ppname,subpath,w)
+                                    if isreadable(fname) then
+                                        if trace_detail then
+                                            report_resolving("found '%s' by scanning",fname)
                                         end
+                                        result[#result+1] = fname
+                                        done = true
+                                        if not allresults then break end
                                     end
                                 end
                             else
diff --git a/Master/bin/i386-kfreebsd/mtxrun b/Master/bin/i386-kfreebsd/mtxrun
index 5fbc817e24a..8debdf95551 100755
--- a/Master/bin/i386-kfreebsd/mtxrun
+++ b/Master/bin/i386-kfreebsd/mtxrun
@@ -12135,7 +12135,7 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
                         end
                     end
                 end
-                if not done and doscan then
+                if not done then
                     -- check if on disk / unchecked / does not work at all / also zips
                     -- TH perhaps it did not work because of missing resolvers.resolve() 
                     -- and resolvers.scanfiles() calls ...
@@ -12146,22 +12146,19 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
                         if not find(pname,"%*") then
                             local ppname = gsub(pname,"/+$","")
                             if can_be_dir(ppname) then
-                                local files = resolvers.scanfiles(ppname)
-                                if files then 
-                                    for k=1,#wantedfiles do
-                                        local w = wantedfiles[k]
-                                        local subpath = files[w]
-                                        if subpath then
-                                            local fname = filejoin(ppname,subpath,w)
-                                            if isreadable(fname) then
-                                                if trace_detail then
-                                                    report_resolving("found '%s' by scanning",fname)
-                                                end
-                                                result[#result+1] = fname
-                                                done = true
-                                                if not allresults then break end
-                                            end
+                                local files = {}
+                                if doscan then files = resolvers.scanfiles(ppname) end
+                                for k=1,#wantedfiles do
+                                    local w = wantedfiles[k]
+                                    local subpath = files[w] or ''
+                                    local fname = filejoin(ppname,subpath,w)
+                                    if isreadable(fname) then
+                                        if trace_detail then
+                                            report_resolving("found '%s' by scanning",fname)
                                         end
+                                        result[#result+1] = fname
+                                        done = true
+                                        if not allresults then break end
                                     end
                                 end
                             else
diff --git a/Master/bin/i386-linux/mtxrun b/Master/bin/i386-linux/mtxrun
index 5fbc817e24a..8debdf95551 100755
--- a/Master/bin/i386-linux/mtxrun
+++ b/Master/bin/i386-linux/mtxrun
@@ -12135,7 +12135,7 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
                         end
                     end
                 end
-                if not done and doscan then
+                if not done then
                     -- check if on disk / unchecked / does not work at all / also zips
                     -- TH perhaps it did not work because of missing resolvers.resolve() 
                     -- and resolvers.scanfiles() calls ...
@@ -12146,22 +12146,19 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
                         if not find(pname,"%*") then
                             local ppname = gsub(pname,"/+$","")
                             if can_be_dir(ppname) then
-                                local files = resolvers.scanfiles(ppname)
-                                if files then 
-                                    for k=1,#wantedfiles do
-                                        local w = wantedfiles[k]
-                                        local subpath = files[w]
-                                        if subpath then
-                                            local fname = filejoin(ppname,subpath,w)
-                                            if isreadable(fname) then
-                                                if trace_detail then
-                                                    report_resolving("found '%s' by scanning",fname)
-                                                end
-                                                result[#result+1] = fname
-                                                done = true
-                                                if not allresults then break end
-                                            end
+                                local files = {}
+                                if doscan then files = resolvers.scanfiles(ppname) end
+                                for k=1,#wantedfiles do
+                                    local w = wantedfiles[k]
+                                    local subpath = files[w] or ''
+                                    local fname = filejoin(ppname,subpath,w)
+                                    if isreadable(fname) then
+                                        if trace_detail then
+                                            report_resolving("found '%s' by scanning",fname)
                                         end
+                                        result[#result+1] = fname
+                                        done = true
+                                        if not allresults then break end
                                     end
                                 end
                             else
diff --git a/Master/bin/i386-netbsd/mtxrun b/Master/bin/i386-netbsd/mtxrun
index 5fbc817e24a..8debdf95551 100755
--- a/Master/bin/i386-netbsd/mtxrun
+++ b/Master/bin/i386-netbsd/mtxrun
@@ -12135,7 +12135,7 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
                         end
                     end
                 end
-                if not done and doscan then
+                if not done then
                     -- check if on disk / unchecked / does not work at all / also zips
                     -- TH perhaps it did not work because of missing resolvers.resolve() 
                     -- and resolvers.scanfiles() calls ...
@@ -12146,22 +12146,19 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
                         if not find(pname,"%*") then
                             local ppname = gsub(pname,"/+$","")
                             if can_be_dir(ppname) then
-                                local files = resolvers.scanfiles(ppname)
-                                if files then 
-                                    for k=1,#wantedfiles do
-                                        local w = wantedfiles[k]
-                                        local subpath = files[w]
-                                        if subpath then
-                                            local fname = filejoin(ppname,subpath,w)
-                                            if isreadable(fname) then
-                                                if trace_detail then
-                                                    report_resolving("found '%s' by scanning",fname)
-                                                end
-                                                result[#result+1] = fname
-                                                done = true
-                                                if not allresults then break end
-                                            end
+                                local files = {}
+                                if doscan then files = resolvers.scanfiles(ppname) end
+                                for k=1,#wantedfiles do
+                                    local w = wantedfiles[k]
+                                    local subpath = files[w] or ''
+                                    local fname = filejoin(ppname,subpath,w)
+                                    if isreadable(fname) then
+                                        if trace_detail then
+                                            report_resolving("found '%s' by scanning",fname)
                                         end
+                                        result[#result+1] = fname
+                                        done = true
+                                        if not allresults then break end
                                     end
                                 end
                             else
diff --git a/Master/bin/i386-solaris/mtxrun b/Master/bin/i386-solaris/mtxrun
index 5fbc817e24a..8debdf95551 100755
--- a/Master/bin/i386-solaris/mtxrun
+++ b/Master/bin/i386-solaris/mtxrun
@@ -12135,7 +12135,7 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
                         end
                     end
                 end
-                if not done and doscan then
+                if not done then
                     -- check if on disk / unchecked / does not work at all / also zips
                     -- TH perhaps it did not work because of missing resolvers.resolve() 
                     -- and resolvers.scanfiles() calls ...
@@ -12146,22 +12146,19 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
                         if not find(pname,"%*") then
                             local ppname = gsub(pname,"/+$","")
                             if can_be_dir(ppname) then
-                                local files = resolvers.scanfiles(ppname)
-                                if files then 
-                                    for k=1,#wantedfiles do
-                                        local w = wantedfiles[k]
-                                        local subpath = files[w]
-                                        if subpath then
-                                            local fname = filejoin(ppname,subpath,w)
-                                            if isreadable(fname) then
-                                                if trace_detail then
-                                                    report_resolving("found '%s' by scanning",fname)
-                                                end
-                                                result[#result+1] = fname
-                                                done = true
-                                                if not allresults then break end
-                                            end
+                                local files = {}
+                                if doscan then files = resolvers.scanfiles(ppname) end
+                                for k=1,#wantedfiles do
+                                    local w = wantedfiles[k]
+                                    local subpath = files[w] or ''
+                                    local fname = filejoin(ppname,subpath,w)
+                                    if isreadable(fname) then
+                                        if trace_detail then
+                                            report_resolving("found '%s' by scanning",fname)
                                         end
+                                        result[#result+1] = fname
+                                        done = true
+                                        if not allresults then break end
                                     end
                                 end
                             else
diff --git a/Master/bin/mips-irix/mtxrun b/Master/bin/mips-irix/mtxrun
index 5fbc817e24a..8debdf95551 100755
--- a/Master/bin/mips-irix/mtxrun
+++ b/Master/bin/mips-irix/mtxrun
@@ -12135,7 +12135,7 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
                         end
                     end
                 end
-                if not done and doscan then
+                if not done then
                     -- check if on disk / unchecked / does not work at all / also zips
                     -- TH perhaps it did not work because of missing resolvers.resolve() 
                     -- and resolvers.scanfiles() calls ...
@@ -12146,22 +12146,19 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
                         if not find(pname,"%*") then
                             local ppname = gsub(pname,"/+$","")
                             if can_be_dir(ppname) then
-                                local files = resolvers.scanfiles(ppname)
-                                if files then 
-                                    for k=1,#wantedfiles do
-                                        local w = wantedfiles[k]
-                                        local subpath = files[w]
-                                        if subpath then
-                                            local fname = filejoin(ppname,subpath,w)
-                                            if isreadable(fname) then
-                                                if trace_detail then
-                                                    report_resolving("found '%s' by scanning",fname)
-                                                end
-                                                result[#result+1] = fname
-                                                done = true
-                                                if not allresults then break end
-                                            end
+                                local files = {}
+                                if doscan then files = resolvers.scanfiles(ppname) end
+                                for k=1,#wantedfiles do
+                                    local w = wantedfiles[k]
+                                    local subpath = files[w] or ''
+                                    local fname = filejoin(ppname,subpath,w)
+                                    if isreadable(fname) then
+                                        if trace_detail then
+                                            report_resolving("found '%s' by scanning",fname)
                                         end
+                                        result[#result+1] = fname
+                                        done = true
+                                        if not allresults then break end
                                     end
                                 end
                             else
diff --git a/Master/bin/powerpc-aix/mtxrun b/Master/bin/powerpc-aix/mtxrun
index 5fbc817e24a..8debdf95551 100755
--- a/Master/bin/powerpc-aix/mtxrun
+++ b/Master/bin/powerpc-aix/mtxrun
@@ -12135,7 +12135,7 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
                         end
                     end
                 end
-                if not done and doscan then
+                if not done then
                     -- check if on disk / unchecked / does not work at all / also zips
                     -- TH perhaps it did not work because of missing resolvers.resolve() 
                     -- and resolvers.scanfiles() calls ...
@@ -12146,22 +12146,19 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
                         if not find(pname,"%*") then
                             local ppname = gsub(pname,"/+$","")
                             if can_be_dir(ppname) then
-                                local files = resolvers.scanfiles(ppname)
-                                if files then 
-                                    for k=1,#wantedfiles do
-                                        local w = wantedfiles[k]
-                                        local subpath = files[w]
-                                        if subpath then
-                                            local fname = filejoin(ppname,subpath,w)
-                                            if isreadable(fname) then
-                                                if trace_detail then
-                                                    report_resolving("found '%s' by scanning",fname)
-                                                end
-                                                result[#result+1] = fname
-                                                done = true
-                                                if not allresults then break end
-                                            end
+                                local files = {}
+                                if doscan then files = resolvers.scanfiles(ppname) end
+                                for k=1,#wantedfiles do
+                                    local w = wantedfiles[k]
+                                    local subpath = files[w] or ''
+                                    local fname = filejoin(ppname,subpath,w)
+                                    if isreadable(fname) then
+                                        if trace_detail then
+                                            report_resolving("found '%s' by scanning",fname)
                                         end
+                                        result[#result+1] = fname
+                                        done = true
+                                        if not allresults then break end
                                     end
                                 end
                             else
diff --git a/Master/bin/powerpc-linux/mtxrun b/Master/bin/powerpc-linux/mtxrun
index 5fbc817e24a..8debdf95551 100755
--- a/Master/bin/powerpc-linux/mtxrun
+++ b/Master/bin/powerpc-linux/mtxrun
@@ -12135,7 +12135,7 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
                         end
                     end
                 end
-                if not done and doscan then
+                if not done then
                     -- check if on disk / unchecked / does not work at all / also zips
                     -- TH perhaps it did not work because of missing resolvers.resolve() 
                     -- and resolvers.scanfiles() calls ...
@@ -12146,22 +12146,19 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
                         if not find(pname,"%*") then
                             local ppname = gsub(pname,"/+$","")
                             if can_be_dir(ppname) then
-                                local files = resolvers.scanfiles(ppname)
-                                if files then 
-                                    for k=1,#wantedfiles do
-                                        local w = wantedfiles[k]
-                                        local subpath = files[w]
-                                        if subpath then
-                                            local fname = filejoin(ppname,subpath,w)
-                                            if isreadable(fname) then
-                                                if trace_detail then
-                                                    report_resolving("found '%s' by scanning",fname)
-                                                end
-                                                result[#result+1] = fname
-                                                done = true
-                                                if not allresults then break end
-                                            end
+                                local files = {}
+                                if doscan then files = resolvers.scanfiles(ppname) end
+                                for k=1,#wantedfiles do
+                                    local w = wantedfiles[k]
+                                    local subpath = files[w] or ''
+                                    local fname = filejoin(ppname,subpath,w)
+                                    if isreadable(fname) then
+                                        if trace_detail then
+                                            report_resolving("found '%s' by scanning",fname)
                                         end
+                                        result[#result+1] = fname
+                                        done = true
+                                        if not allresults then break end
                                     end
                                 end
                             else
diff --git a/Master/bin/sparc-linux/mtxrun b/Master/bin/sparc-linux/mtxrun
index 5fbc817e24a..8debdf95551 100755
--- a/Master/bin/sparc-linux/mtxrun
+++ b/Master/bin/sparc-linux/mtxrun
@@ -12135,7 +12135,7 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
                         end
                     end
                 end
-                if not done and doscan then
+                if not done then
                     -- check if on disk / unchecked / does not work at all / also zips
                     -- TH perhaps it did not work because of missing resolvers.resolve() 
                     -- and resolvers.scanfiles() calls ...
@@ -12146,22 +12146,19 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
                         if not find(pname,"%*") then
                             local ppname = gsub(pname,"/+$","")
                             if can_be_dir(ppname) then
-                                local files = resolvers.scanfiles(ppname)
-                                if files then 
-                                    for k=1,#wantedfiles do
-                                        local w = wantedfiles[k]
-                                        local subpath = files[w]
-                                        if subpath then
-                                            local fname = filejoin(ppname,subpath,w)
-                                            if isreadable(fname) then
-                                                if trace_detail then
-                                                    report_resolving("found '%s' by scanning",fname)
-                                                end
-                                                result[#result+1] = fname
-                                                done = true
-                                                if not allresults then break end
-                                            end
+                                local files = {}
+                                if doscan then files = resolvers.scanfiles(ppname) end
+                                for k=1,#wantedfiles do
+                                    local w = wantedfiles[k]
+                                    local subpath = files[w] or ''
+                                    local fname = filejoin(ppname,subpath,w)
+                                    if isreadable(fname) then
+                                        if trace_detail then
+                                            report_resolving("found '%s' by scanning",fname)
                                         end
+                                        result[#result+1] = fname
+                                        done = true
+                                        if not allresults then break end
                                     end
                                 end
                             else
diff --git a/Master/bin/sparc-solaris/mtxrun b/Master/bin/sparc-solaris/mtxrun
index 5fbc817e24a..8debdf95551 100755
--- a/Master/bin/sparc-solaris/mtxrun
+++ b/Master/bin/sparc-solaris/mtxrun
@@ -12135,7 +12135,7 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
                         end
                     end
                 end
-                if not done and doscan then
+                if not done then
                     -- check if on disk / unchecked / does not work at all / also zips
                     -- TH perhaps it did not work because of missing resolvers.resolve() 
                     -- and resolvers.scanfiles() calls ...
@@ -12146,22 +12146,19 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
                         if not find(pname,"%*") then
                             local ppname = gsub(pname,"/+$","")
                             if can_be_dir(ppname) then
-                                local files = resolvers.scanfiles(ppname)
-                                if files then 
-                                    for k=1,#wantedfiles do
-                                        local w = wantedfiles[k]
-                                        local subpath = files[w]
-                                        if subpath then
-                                            local fname = filejoin(ppname,subpath,w)
-                                            if isreadable(fname) then
-                                                if trace_detail then
-                                                    report_resolving("found '%s' by scanning",fname)
-                                                end
-                                                result[#result+1] = fname
-                                                done = true
-                                                if not allresults then break end
-                                            end
+                                local files = {}
+                                if doscan then files = resolvers.scanfiles(ppname) end
+                                for k=1,#wantedfiles do
+                                    local w = wantedfiles[k]
+                                    local subpath = files[w] or ''
+                                    local fname = filejoin(ppname,subpath,w)
+                                    if isreadable(fname) then
+                                        if trace_detail then
+                                            report_resolving("found '%s' by scanning",fname)
                                         end
+                                        result[#result+1] = fname
+                                        done = true
+                                        if not allresults then break end
                                     end
                                 end
                             else
diff --git a/Master/bin/universal-darwin/mtxrun b/Master/bin/universal-darwin/mtxrun
index 5fbc817e24a..8debdf95551 100755
--- a/Master/bin/universal-darwin/mtxrun
+++ b/Master/bin/universal-darwin/mtxrun
@@ -12135,7 +12135,7 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
                         end
                     end
                 end
-                if not done and doscan then
+                if not done then
                     -- check if on disk / unchecked / does not work at all / also zips
                     -- TH perhaps it did not work because of missing resolvers.resolve() 
                     -- and resolvers.scanfiles() calls ...
@@ -12146,22 +12146,19 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
                         if not find(pname,"%*") then
                             local ppname = gsub(pname,"/+$","")
                             if can_be_dir(ppname) then
-                                local files = resolvers.scanfiles(ppname)
-                                if files then 
-                                    for k=1,#wantedfiles do
-                                        local w = wantedfiles[k]
-                                        local subpath = files[w]
-                                        if subpath then
-                                            local fname = filejoin(ppname,subpath,w)
-                                            if isreadable(fname) then
-                                                if trace_detail then
-                                                    report_resolving("found '%s' by scanning",fname)
-                                                end
-                                                result[#result+1] = fname
-                                                done = true
-                                                if not allresults then break end
-                                            end
+                                local files = {}
+                                if doscan then files = resolvers.scanfiles(ppname) end
+                                for k=1,#wantedfiles do
+                                    local w = wantedfiles[k]
+                                    local subpath = files[w] or ''
+                                    local fname = filejoin(ppname,subpath,w)
+                                    if isreadable(fname) then
+                                        if trace_detail then
+                                            report_resolving("found '%s' by scanning",fname)
                                         end
+                                        result[#result+1] = fname
+                                        done = true
+                                        if not allresults then break end
                                     end
                                 end
                             else
diff --git a/Master/bin/win32/mtxrun.lua b/Master/bin/win32/mtxrun.lua
index 5fbc817e24a..8debdf95551 100755
--- a/Master/bin/win32/mtxrun.lua
+++ b/Master/bin/win32/mtxrun.lua
@@ -12135,7 +12135,7 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
                         end
                     end
                 end
-                if not done and doscan then
+                if not done then
                     -- check if on disk / unchecked / does not work at all / also zips
                     -- TH perhaps it did not work because of missing resolvers.resolve() 
                     -- and resolvers.scanfiles() calls ...
@@ -12146,22 +12146,19 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
                         if not find(pname,"%*") then
                             local ppname = gsub(pname,"/+$","")
                             if can_be_dir(ppname) then
-                                local files = resolvers.scanfiles(ppname)
-                                if files then 
-                                    for k=1,#wantedfiles do
-                                        local w = wantedfiles[k]
-                                        local subpath = files[w]
-                                        if subpath then
-                                            local fname = filejoin(ppname,subpath,w)
-                                            if isreadable(fname) then
-                                                if trace_detail then
-                                                    report_resolving("found '%s' by scanning",fname)
-                                                end
-                                                result[#result+1] = fname
-                                                done = true
-                                                if not allresults then break end
-                                            end
+                                local files = {}
+                                if doscan then files = resolvers.scanfiles(ppname) end
+                                for k=1,#wantedfiles do
+                                    local w = wantedfiles[k]
+                                    local subpath = files[w] or ''
+                                    local fname = filejoin(ppname,subpath,w)
+                                    if isreadable(fname) then
+                                        if trace_detail then
+                                            report_resolving("found '%s' by scanning",fname)
                                         end
+                                        result[#result+1] = fname
+                                        done = true
+                                        if not allresults then break end
                                     end
                                 end
                             else
diff --git a/Master/bin/x86_64-darwin/mtxrun b/Master/bin/x86_64-darwin/mtxrun
index 5fbc817e24a..8debdf95551 100755
--- a/Master/bin/x86_64-darwin/mtxrun
+++ b/Master/bin/x86_64-darwin/mtxrun
@@ -12135,7 +12135,7 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
                         end
                     end
                 end
-                if not done and doscan then
+                if not done then
                     -- check if on disk / unchecked / does not work at all / also zips
                     -- TH perhaps it did not work because of missing resolvers.resolve() 
                     -- and resolvers.scanfiles() calls ...
@@ -12146,22 +12146,19 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
                         if not find(pname,"%*") then
                             local ppname = gsub(pname,"/+$","")
                             if can_be_dir(ppname) then
-                                local files = resolvers.scanfiles(ppname)
-                                if files then 
-                                    for k=1,#wantedfiles do
-                                        local w = wantedfiles[k]
-                                        local subpath = files[w]
-                                        if subpath then
-                                            local fname = filejoin(ppname,subpath,w)
-                                            if isreadable(fname) then
-                                                if trace_detail then
-                                                    report_resolving("found '%s' by scanning",fname)
-                                                end
-                                                result[#result+1] = fname
-                                                done = true
-                                                if not allresults then break end
-                                            end
+                                local files = {}
+                                if doscan then files = resolvers.scanfiles(ppname) end
+                                for k=1,#wantedfiles do
+                                    local w = wantedfiles[k]
+                                    local subpath = files[w] or ''
+                                    local fname = filejoin(ppname,subpath,w)
+                                    if isreadable(fname) then
+                                        if trace_detail then
+                                            report_resolving("found '%s' by scanning",fname)
                                         end
+                                        result[#result+1] = fname
+                                        done = true
+                                        if not allresults then break end
                                     end
                                 end
                             else
diff --git a/Master/bin/x86_64-linux/mtxrun b/Master/bin/x86_64-linux/mtxrun
index 5fbc817e24a..8debdf95551 100755
--- a/Master/bin/x86_64-linux/mtxrun
+++ b/Master/bin/x86_64-linux/mtxrun
@@ -12135,7 +12135,7 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
                         end
                     end
                 end
-                if not done and doscan then
+                if not done then
                     -- check if on disk / unchecked / does not work at all / also zips
                     -- TH perhaps it did not work because of missing resolvers.resolve() 
                     -- and resolvers.scanfiles() calls ...
@@ -12146,22 +12146,19 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
                         if not find(pname,"%*") then
                             local ppname = gsub(pname,"/+$","")
                             if can_be_dir(ppname) then
-                                local files = resolvers.scanfiles(ppname)
-                                if files then 
-                                    for k=1,#wantedfiles do
-                                        local w = wantedfiles[k]
-                                        local subpath = files[w]
-                                        if subpath then
-                                            local fname = filejoin(ppname,subpath,w)
-                                            if isreadable(fname) then
-                                                if trace_detail then
-                                                    report_resolving("found '%s' by scanning",fname)
-                                                end
-                                                result[#result+1] = fname
-                                                done = true
-                                                if not allresults then break end
-                                            end
+                                local files = {}
+                                if doscan then files = resolvers.scanfiles(ppname) end
+                                for k=1,#wantedfiles do
+                                    local w = wantedfiles[k]
+                                    local subpath = files[w] or ''
+                                    local fname = filejoin(ppname,subpath,w)
+                                    if isreadable(fname) then
+                                        if trace_detail then
+                                            report_resolving("found '%s' by scanning",fname)
                                         end
+                                        result[#result+1] = fname
+                                        done = true
+                                        if not allresults then break end
                                     end
                                 end
                             else
diff --git a/Master/bin/x86_64-solaris/mtxrun b/Master/bin/x86_64-solaris/mtxrun
index 5fbc817e24a..8debdf95551 100755
--- a/Master/bin/x86_64-solaris/mtxrun
+++ b/Master/bin/x86_64-solaris/mtxrun
@@ -12135,7 +12135,7 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
                         end
                     end
                 end
-                if not done and doscan then
+                if not done then
                     -- check if on disk / unchecked / does not work at all / also zips
                     -- TH perhaps it did not work because of missing resolvers.resolve() 
                     -- and resolvers.scanfiles() calls ...
@@ -12146,22 +12146,19 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
                         if not find(pname,"%*") then
                             local ppname = gsub(pname,"/+$","")
                             if can_be_dir(ppname) then
-                                local files = resolvers.scanfiles(ppname)
-                                if files then 
-                                    for k=1,#wantedfiles do
-                                        local w = wantedfiles[k]
-                                        local subpath = files[w]
-                                        if subpath then
-                                            local fname = filejoin(ppname,subpath,w)
-                                            if isreadable(fname) then
-                                                if trace_detail then
-                                                    report_resolving("found '%s' by scanning",fname)
-                                                end
-                                                result[#result+1] = fname
-                                                done = true
-                                                if not allresults then break end
-                                            end
+                                local files = {}
+                                if doscan then files = resolvers.scanfiles(ppname) end
+                                for k=1,#wantedfiles do
+                                    local w = wantedfiles[k]
+                                    local subpath = files[w] or ''
+                                    local fname = filejoin(ppname,subpath,w)
+                                    if isreadable(fname) then
+                                        if trace_detail then
+                                            report_resolving("found '%s' by scanning",fname)
                                         end
+                                        result[#result+1] = fname
+                                        done = true
+                                        if not allresults then break end
                                     end
                                 end
                             else
diff --git a/Master/texmf-dist/scripts/context/lua/mtxrun.lua b/Master/texmf-dist/scripts/context/lua/mtxrun.lua
index 5fbc817e24a..8debdf95551 100755
--- a/Master/texmf-dist/scripts/context/lua/mtxrun.lua
+++ b/Master/texmf-dist/scripts/context/lua/mtxrun.lua
@@ -12135,7 +12135,7 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
                         end
                     end
                 end
-                if not done and doscan then
+                if not done then
                     -- check if on disk / unchecked / does not work at all / also zips
                     -- TH perhaps it did not work because of missing resolvers.resolve() 
                     -- and resolvers.scanfiles() calls ...
@@ -12146,22 +12146,19 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
                         if not find(pname,"%*") then
                             local ppname = gsub(pname,"/+$","")
                             if can_be_dir(ppname) then
-                                local files = resolvers.scanfiles(ppname)
-                                if files then 
-                                    for k=1,#wantedfiles do
-                                        local w = wantedfiles[k]
-                                        local subpath = files[w]
-                                        if subpath then
-                                            local fname = filejoin(ppname,subpath,w)
-                                            if isreadable(fname) then
-                                                if trace_detail then
-                                                    report_resolving("found '%s' by scanning",fname)
-                                                end
-                                                result[#result+1] = fname
-                                                done = true
-                                                if not allresults then break end
-                                            end
+                                local files = {}
+                                if doscan then files = resolvers.scanfiles(ppname) end
+                                for k=1,#wantedfiles do
+                                    local w = wantedfiles[k]
+                                    local subpath = files[w] or ''
+                                    local fname = filejoin(ppname,subpath,w)
+                                    if isreadable(fname) then
+                                        if trace_detail then
+                                            report_resolving("found '%s' by scanning",fname)
                                         end
+                                        result[#result+1] = fname
+                                        done = true
+                                        if not allresults then break end
                                     end
                                 end
                             else
diff --git a/Master/texmf-dist/scripts/context/stubs/mswin/mtxrun.lua b/Master/texmf-dist/scripts/context/stubs/mswin/mtxrun.lua
index 5fbc817e24a..8debdf95551 100755
--- a/Master/texmf-dist/scripts/context/stubs/mswin/mtxrun.lua
+++ b/Master/texmf-dist/scripts/context/stubs/mswin/mtxrun.lua
@@ -12135,7 +12135,7 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
                         end
                     end
                 end
-                if not done and doscan then
+                if not done then
                     -- check if on disk / unchecked / does not work at all / also zips
                     -- TH perhaps it did not work because of missing resolvers.resolve() 
                     -- and resolvers.scanfiles() calls ...
@@ -12146,22 +12146,19 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
                         if not find(pname,"%*") then
                             local ppname = gsub(pname,"/+$","")
                             if can_be_dir(ppname) then
-                                local files = resolvers.scanfiles(ppname)
-                                if files then 
-                                    for k=1,#wantedfiles do
-                                        local w = wantedfiles[k]
-                                        local subpath = files[w]
-                                        if subpath then
-                                            local fname = filejoin(ppname,subpath,w)
-                                            if isreadable(fname) then
-                                                if trace_detail then
-                                                    report_resolving("found '%s' by scanning",fname)
-                                                end
-                                                result[#result+1] = fname
-                                                done = true
-                                                if not allresults then break end
-                                            end
+                                local files = {}
+                                if doscan then files = resolvers.scanfiles(ppname) end
+                                for k=1,#wantedfiles do
+                                    local w = wantedfiles[k]
+                                    local subpath = files[w] or ''
+                                    local fname = filejoin(ppname,subpath,w)
+                                    if isreadable(fname) then
+                                        if trace_detail then
+                                            report_resolving("found '%s' by scanning",fname)
                                         end
+                                        result[#result+1] = fname
+                                        done = true
+                                        if not allresults then break end
                                     end
                                 end
                             else
diff --git a/Master/texmf-dist/scripts/context/stubs/unix/mtxrun b/Master/texmf-dist/scripts/context/stubs/unix/mtxrun
index 5fbc817e24a..8debdf95551 100755
--- a/Master/texmf-dist/scripts/context/stubs/unix/mtxrun
+++ b/Master/texmf-dist/scripts/context/stubs/unix/mtxrun
@@ -12135,7 +12135,7 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
                         end
                     end
                 end
-                if not done and doscan then
+                if not done then
                     -- check if on disk / unchecked / does not work at all / also zips
                     -- TH perhaps it did not work because of missing resolvers.resolve() 
                     -- and resolvers.scanfiles() calls ...
@@ -12146,22 +12146,19 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
                         if not find(pname,"%*") then
                             local ppname = gsub(pname,"/+$","")
                             if can_be_dir(ppname) then
-                                local files = resolvers.scanfiles(ppname)
-                                if files then 
-                                    for k=1,#wantedfiles do
-                                        local w = wantedfiles[k]
-                                        local subpath = files[w]
-                                        if subpath then
-                                            local fname = filejoin(ppname,subpath,w)
-                                            if isreadable(fname) then
-                                                if trace_detail then
-                                                    report_resolving("found '%s' by scanning",fname)
-                                                end
-                                                result[#result+1] = fname
-                                                done = true
-                                                if not allresults then break end
-                                            end
+                                local files = {}
+                                if doscan then files = resolvers.scanfiles(ppname) end
+                                for k=1,#wantedfiles do
+                                    local w = wantedfiles[k]
+                                    local subpath = files[w] or ''
+                                    local fname = filejoin(ppname,subpath,w)
+                                    if isreadable(fname) then
+                                        if trace_detail then
+                                            report_resolving("found '%s' by scanning",fname)
                                         end
+                                        result[#result+1] = fname
+                                        done = true
+                                        if not allresults then break end
                                     end
                                 end
                             else
diff --git a/Master/texmf-dist/tex/context/base/data-res.lua b/Master/texmf-dist/tex/context/base/data-res.lua
index cac283092c2..3422564139c 100644
--- a/Master/texmf-dist/tex/context/base/data-res.lua
+++ b/Master/texmf-dist/tex/context/base/data-res.lua
@@ -1051,7 +1051,7 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
                         end
                     end
                 end
-                if not done and doscan then
+                if not done then
                     -- check if on disk / unchecked / does not work at all / also zips
                     -- TH perhaps it did not work because of missing resolvers.resolve() 
                     -- and resolvers.scanfiles() calls ...
@@ -1062,22 +1062,19 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
                         if not find(pname,"%*") then
                             local ppname = gsub(pname,"/+$","")
                             if can_be_dir(ppname) then
-                                local files = resolvers.scanfiles(ppname)
-                                if files then 
-                                    for k=1,#wantedfiles do
-                                        local w = wantedfiles[k]
-                                        local subpath = files[w]
-                                        if subpath then
-                                            local fname = filejoin(ppname,subpath,w)
-                                            if isreadable(fname) then
-                                                if trace_detail then
-                                                    report_resolving("found '%s' by scanning",fname)
-                                                end
-                                                result[#result+1] = fname
-                                                done = true
-                                                if not allresults then break end
-                                            end
+                                local files = {}
+                                if doscan then files = resolvers.scanfiles(ppname) end
+                                for k=1,#wantedfiles do
+                                    local w = wantedfiles[k]
+                                    local subpath = files[w] or ''
+                                    local fname = filejoin(ppname,subpath,w)
+                                    if isreadable(fname) then
+                                        if trace_detail then
+                                            report_resolving("found '%s' by scanning",fname)
                                         end
+                                        result[#result+1] = fname
+                                        done = true
+                                        if not allresults then break end
                                     end
                                 end
                             else