From 07b6abbd78f5eb05b7abfdc34d167321a53a22d3 Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Tue, 17 Jul 2018 16:25:36 -0300 Subject: forward error messages from fs.unzip --- src/luarocks/fetch.lua | 4 ++-- src/luarocks/manif.lua | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/luarocks/fetch.lua b/src/luarocks/fetch.lua index 074b0e45..4031ec66 100644 --- a/src/luarocks/fetch.lua +++ b/src/luarocks/fetch.lua @@ -155,9 +155,9 @@ function fetch.fetch_and_unpack_rock(rock_file, dest) end local ok, err = fs.change_dir(unpack_dir) if not ok then return nil, err end - ok = fs.unzip(rock_file) + ok, err = fs.unzip(rock_file) if not ok then - return nil, "Failed unpacking rock file: " .. rock_file + return nil, "Failed unpacking rock file: " .. rock_file .. ": " .. err end fs.pop_dir() return unpack_dir diff --git a/src/luarocks/manif.lua b/src/luarocks/manif.lua index d6980299..0bef6f13 100644 --- a/src/luarocks/manif.lua +++ b/src/luarocks/manif.lua @@ -132,12 +132,12 @@ function manif.load_manifest(repo_url, lua_version) fs.change_dir(dirname) local nozip = pathname:match("(.*)%.zip$") fs.delete(nozip) - local ok = fs.unzip(pathname) + local ok, err = fs.unzip(pathname) fs.pop_dir() if not ok then fs.delete(pathname) fs.delete(pathname..".timestamp") - return nil, "Failed extracting manifest file" + return nil, "Failed extracting manifest file: " .. err end pathname = nozip end -- cgit v1.2.3-55-g6feb