diff options
| author | Hisham Muhammad <hisham@gobolinux.org> | 2014-05-26 00:55:52 -0300 |
|---|---|---|
| committer | Hisham Muhammad <hisham@gobolinux.org> | 2014-05-26 00:55:52 -0300 |
| commit | 0d9bc9eb541cdac6ae55c5c313a29be275cdd812 (patch) | |
| tree | 3231d63f76781d42415b160b763220307db36f6b /src | |
| parent | 4f66cbdbabc19e1b52ad3d82a800e2b892254718 (diff) | |
| parent | a9bd5cac0649f2b3bbbcbff4bab6d2082a974a9e (diff) | |
| download | luarocks-0d9bc9eb541cdac6ae55c5c313a29be275cdd812.tar.gz luarocks-0d9bc9eb541cdac6ae55c5c313a29be275cdd812.tar.bz2 luarocks-0d9bc9eb541cdac6ae55c5c313a29be275cdd812.zip | |
Merge branch 'master' of https://github.com/keplerproject/luarocks
Diffstat (limited to 'src')
| -rw-r--r-- | src/luarocks/fs/unix/tools.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/luarocks/fs/unix/tools.lua b/src/luarocks/fs/unix/tools.lua index f8f39eca..69466931 100644 --- a/src/luarocks/fs/unix/tools.lua +++ b/src/luarocks/fs/unix/tools.lua | |||
| @@ -264,7 +264,7 @@ function tools.download(url, filename, cache) | |||
| 264 | elseif cfg.downloader == "curl" then | 264 | elseif cfg.downloader == "curl" then |
| 265 | local curl_cmd = fs.Q(vars.CURL).." -f -k -L --user-agent '"..cfg.user_agent.." via curl' " | 265 | local curl_cmd = fs.Q(vars.CURL).." -f -k -L --user-agent '"..cfg.user_agent.." via curl' " |
| 266 | if cfg.connection_timeout and cfg.connection_timeout > 0 then | 266 | if cfg.connection_timeout and cfg.connection_timeout > 0 then |
| 267 | curl_cmd = curl_cmd .. "--connect-timeout="..tonumber(cfg.connection_timeout).." " | 267 | curl_cmd = curl_cmd .. "--connect-timeout "..tonumber(cfg.connection_timeout).." " |
| 268 | end | 268 | end |
| 269 | ok = fs.execute_string(curl_cmd..fs.Q(url).." 2> /dev/null 1> "..fs.Q(filename)) | 269 | ok = fs.execute_string(curl_cmd..fs.Q(url).." 2> /dev/null 1> "..fs.Q(filename)) |
| 270 | end | 270 | end |