aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThijs Schreijer <thijs@thijsschreijer.nl>2016-01-10 22:49:42 -0800
committerThijs Schreijer <thijs@thijsschreijer.nl>2016-01-10 22:49:42 -0800
commitb1db72d91cda7a17b2f95a0a4f90b838cbf7993f (patch)
tree5e2b64f72dca79ac6c0bc0680680b7b1e472fffe /src
parent2f183bcd1a596748b4f117d9f07f31a006e3b8bb (diff)
downloadluarocks-b1db72d91cda7a17b2f95a0a4f90b838cbf7993f.tar.gz
luarocks-b1db72d91cda7a17b2f95a0a4f90b838cbf7993f.tar.bz2
luarocks-b1db72d91cda7a17b2f95a0a4f90b838cbf7993f.zip
removed duplicate code, this part seems copy-pasted from the part that was later fixed by #455, hence this still contained the same bug
Diffstat (limited to 'src')
-rw-r--r--src/luarocks/upload/api.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/luarocks/upload/api.lua b/src/luarocks/upload/api.lua
index b56f23e1..6a830abd 100644
--- a/src/luarocks/upload/api.lua
+++ b/src/luarocks/upload/api.lua
@@ -138,9 +138,9 @@ function Api:request(url, params, post_params)
138 if not json_ok then return nil, "A JSON library is required for this command. "..json end 138 if not json_ok then return nil, "A JSON library is required for this command. "..json end
139 139
140 if cfg.downloader == "wget" then 140 if cfg.downloader == "wget" then
141 local curl_ok = fs.execute_quiet(vars.CURL, "--version") 141 local curl_ok, err = fs.is_tool_available(vars.CURL, "curl")
142 if not curl_ok then 142 if not curl_ok then
143 return nil, "Missing network helper program 'curl'.\nMake sure 'curl' is installed and available from your path." 143 return nil, err
144 end 144 end
145 end 145 end
146 146