From 17e955be6ba36d7fb9169eb2a1e75ed10fa36b73 Mon Sep 17 00:00:00 2001
From: Marius <mariausol@gmail.com>
Date: Thu, 2 Dec 2010 01:40:15 +0200
Subject: beta 2010.12.02 00:11
---
scripts/context/lua/mtxrun.lua | 9 +++++----
scripts/context/stubs/mswin/mtxrun.lua | 9 +++++----
scripts/context/stubs/unix/mtxrun | 9 +++++----
3 files changed, 15 insertions(+), 12 deletions(-)
(limited to 'scripts')
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 100644
--- 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
--
cgit v1.2.3