Merge branch 'master' into luarocks-3

4 files changed, 5 insertions, 6 deletions

diff --git a/src/luarocks/build.lua b/src/luarocks/build.lua
index 4a71b4c5..2d29e23f 100644
--- a/src/luarocks/build.lua
+++ b/src/luarocks/build.lua
@@ -201,8 +201,8 @@ function build.build_rockspec(rockspec_file, need_to_fetch, minimal_mode, deps_m
       return nil, "Rockspec error: build type not specified"
    end
 
+   local ok
    if not build_only_deps then
-      local ok
       ok, err, errcode = deps.check_external_deps(rockspec, "build")
       if err then
          return nil, err, errcode
diff --git a/src/luarocks/fetch.lua b/src/luarocks/fetch.lua
index 3eea61fc..2590afd4 100644
--- a/src/luarocks/fetch.lua
+++ b/src/luarocks/fetch.lua
@@ -353,7 +353,8 @@ function fetch.get_sources(rockspec, extract, dest_dir)
    if extract then
       local ok, err = fs.change_dir(store_dir)
       if not ok then return nil, err end
-      fs.unpack_archive(rockspec.source.file)
+      ok, err = fs.unpack_archive(rockspec.source.file)
+      if not ok then return nil, err end
       if not fs.exists(rockspec.source.dir) then
 
          -- If rockspec.source.dir can't be found, see if we only have one
diff --git a/src/luarocks/fs/unix/tools.lua b/src/luarocks/fs/unix/tools.lua
index 7a67fb22..d0802725 100644
--- a/src/luarocks/fs/unix/tools.lua
+++ b/src/luarocks/fs/unix/tools.lua
@@ -192,8 +192,7 @@ function tools.unpack_archive(archive)
       -- Ignore .lua and .c files; they don't need to be extracted.
       return true
    else
-      local ext = archive:match(".*(%..*)")
-      return false, "Unrecognized filename extension "..(ext or "")
+      return false, "Couldn't extract archive "..archive..": unrecognized filename extension"
    end
    if not ok then
       return false, "Failed extracting "..archive
diff --git a/src/luarocks/fs/win32/tools.lua b/src/luarocks/fs/win32/tools.lua
index 1d47fa59..4adc78d1 100644
--- a/src/luarocks/fs/win32/tools.lua
+++ b/src/luarocks/fs/win32/tools.lua
@@ -204,8 +204,7 @@ function tools.unpack_archive(archive)
       -- Ignore .lua and .c files; they don't need to be extracted.
       return true
    else
-      local ext = archive:match(".*(%..*)")
-      return false, "Unrecognized filename extension "..(ext or "")
+      return false, "Couldn't extract archive "..archive..": unrecognized filename extension"
    end
    if not ok then
       return false, "Failed extracting "..archive