From 40699de5c269507f0a70af1106ea1894d0d965ed Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Thu, 23 Sep 2010 01:46:16 -0300 Subject: modify messages --- src/luarocks/fetch/git.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/luarocks/fetch/git.lua b/src/luarocks/fetch/git.lua index f2f17fb5..6305d781 100644 --- a/src/luarocks/fetch/git.lua +++ b/src/luarocks/fetch/git.lua @@ -39,12 +39,12 @@ function get_sources(rockspec, extract, dest_dir) end fs.change_dir(store_dir) if not fs.execute(unpack(command)) then - return nil, "Failed fetching files from GIT while cloning." + return nil, "Failed cloning git repository." end fs.change_dir(module) if checkout_command then if not fs.execute(unpack(checkout_command)) then - return nil, "Failed fetching files from GIT while getting tag/branch." + return nil, "Failed checking out tag/branch from git repository." end end fs.delete(".git") -- cgit v1.2.3-55-g6feb From cd45b48e8b9ff3e30fa13ea9b17b6d5a01a4b9d5 Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Fri, 15 Oct 2010 02:43:46 -0300 Subject: Add sanity check to is_actual_binary. Should fix crash in 'luarocks pack' reported by Alexander Gladysh, or at least give better diagnostics. --- src/luarocks/fs/unix.lua | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src') diff --git a/src/luarocks/fs/unix.lua b/src/luarocks/fs/unix.lua index f2290412..c5769bac 100644 --- a/src/luarocks/fs/unix.lua +++ b/src/luarocks/fs/unix.lua @@ -101,6 +101,11 @@ function is_actual_binary(filename) if file then local found = false local first = file:read() + if not first then + file:close() + print("Warning: could not read "..filename) + return false + end if first:match("#!.*lua") then file:close() return true -- cgit v1.2.3-55-g6feb