Merge remote-tracking branch 'upstream/master' into linux-multiarch

Conflicts:
	install.bat

1 files changed, 3 insertions, 3 deletions

diff --git a/src/luarocks/fs/win32/tools.lua b/src/luarocks/fs/win32/tools.lua
index b8f9bd36..2e125923 100644
--- a/src/luarocks/fs/win32/tools.lua
+++ b/src/luarocks/fs/win32/tools.lua
@@ -229,7 +229,7 @@ end
 -- additional arguments.
 -- @return boolean: true on success, false on failure.
 function zip(zipfile, ...)
-   return fs.execute(vars.SEVENZ.." a -tzip", zipfile, ...)
+   return fs.execute_quiet(vars.SEVENZ.." a -tzip", zipfile, ...)
 end
 
 --- Uncompress files from a .zip archive.
@@ -237,7 +237,7 @@ end
 -- @return boolean: true on success, false on failure.
 function unzip(zipfile)
    assert(zipfile)
-   return fs.execute(vars.SEVENZ.." x", zipfile)
+   return fs.execute_quiet(vars.SEVENZ.." x", zipfile)
 end
 
 --- Test is pathname is a directory.
@@ -285,7 +285,7 @@ end
 -- @param archive string: Filename of archive.
 -- @return boolean : success status
 local function gunzip(archive)
-  return fs.execute(vars.SEVENZ.." x", archive)
+  return fs.execute_quiet(vars.SEVENZ.." x", archive)
 end
 
 --- Unpack an archive.