Merge branch 'master' of github.com:keplerproject/luarocks

2 files changed, 7 insertions, 2 deletions

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")
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