summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2010-12-02 00:11:00 +0100
committerHans Hagen <pragma@wxs.nl>2010-12-02 00:11:00 +0100
commitf8b69b75c7982cc54043d7ebea2bf3ba72962b5d (patch)
tree7891f0d658619a64fd7733820eeff31a52fbf242 /scripts
parent292f13e9393919609bb24db1b73365c1f3e12196 (diff)
downloadcontext-f8b69b75c7982cc54043d7ebea2bf3ba72962b5d.tar.gz
beta 2010.12.02 00:11
Diffstat (limited to 'scripts')
-rw-r--r--scripts/context/lua/mtxrun.lua9
-rw-r--r--scripts/context/stubs/mswin/mtxrun.lua9
-rwxr-xr-xscripts/context/stubs/unix/mtxrun9
3 files changed, 15 insertions, 12 deletions
diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua
index 6b74022ae..bb16aaec0 100644
--- a/scripts/context/lua/mtxrun.lua
+++ b/scripts/context/lua/mtxrun.lua
@@ -11296,7 +11296,7 @@ function resolvers.registerfilehash(name,content,someerror)
end
function isreadable(name)
- local readable = file.is_readable(name)
+ local readable = lfs.isfile(name) -- not file.is_readable(name) asit can be a dir
if trace_detail then
if readable then
report_resolvers("file '%s' is readable",name)
@@ -11509,10 +11509,11 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
-- search spec
local filetype, extra, done, wantedfiles, ext = '', nil, false, { }, fileextname(filename)
-- tricky as filename can be bla.1.2.3
+
+-- to be checked
+
if ext == "" then
- if not instance.force_suffixes then
- wantedfiles[#wantedfiles+1] = filename
- end
+ wantedfiles[#wantedfiles+1] = filename
else
wantedfiles[#wantedfiles+1] = filename
end
diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua
index 6b74022ae..bb16aaec0 100644
--- a/scripts/context/stubs/mswin/mtxrun.lua
+++ b/scripts/context/stubs/mswin/mtxrun.lua
@@ -11296,7 +11296,7 @@ function resolvers.registerfilehash(name,content,someerror)
end
function isreadable(name)
- local readable = file.is_readable(name)
+ local readable = lfs.isfile(name) -- not file.is_readable(name) asit can be a dir
if trace_detail then
if readable then
report_resolvers("file '%s' is readable",name)
@@ -11509,10 +11509,11 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
-- search spec
local filetype, extra, done, wantedfiles, ext = '', nil, false, { }, fileextname(filename)
-- tricky as filename can be bla.1.2.3
+
+-- to be checked
+
if ext == "" then
- if not instance.force_suffixes then
- wantedfiles[#wantedfiles+1] = filename
- end
+ wantedfiles[#wantedfiles+1] = filename
else
wantedfiles[#wantedfiles+1] = filename
end
diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun
index 6b74022ae..bb16aaec0 100755
--- a/scripts/context/stubs/unix/mtxrun
+++ b/scripts/context/stubs/unix/mtxrun
@@ -11296,7 +11296,7 @@ function resolvers.registerfilehash(name,content,someerror)
end
function isreadable(name)
- local readable = file.is_readable(name)
+ local readable = lfs.isfile(name) -- not file.is_readable(name) asit can be a dir
if trace_detail then
if readable then
report_resolvers("file '%s' is readable",name)
@@ -11509,10 +11509,11 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
-- search spec
local filetype, extra, done, wantedfiles, ext = '', nil, false, { }, fileextname(filename)
-- tricky as filename can be bla.1.2.3
+
+-- to be checked
+
if ext == "" then
- if not instance.force_suffixes then
- wantedfiles[#wantedfiles+1] = filename
- end
+ wantedfiles[#wantedfiles+1] = filename
else
wantedfiles[#wantedfiles+1] = filename
end