diff options
| author | Hisham Muhammad <hisham@gobolinux.org> | 2015-03-18 18:05:38 -0300 |
|---|---|---|
| committer | Hisham Muhammad <hisham@gobolinux.org> | 2015-03-18 18:05:38 -0300 |
| commit | 603b0ea346d050bef2ced801ec8818773aae0fa0 (patch) | |
| tree | a35b932f931b3c3a1ff5d510c05122a1b5e37907 | |
| parent | be3c52ddccabda19b5619117ece6317cc19aa9d5 (diff) | |
| parent | d820069d67fbae82d9e50cc347704399d34a4464 (diff) | |
| download | luarocks-603b0ea346d050bef2ced801ec8818773aae0fa0.tar.gz luarocks-603b0ea346d050bef2ced801ec8818773aae0fa0.tar.bz2 luarocks-603b0ea346d050bef2ced801ec8818773aae0fa0.zip | |
Merge branch 'master' of https://github.com/keplerproject/luarocks
| -rw-r--r-- | src/luarocks/upload/api.lua | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/luarocks/upload/api.lua b/src/luarocks/upload/api.lua index 6dfb98df..3ab271ad 100644 --- a/src/luarocks/upload/api.lua +++ b/src/luarocks/upload/api.lua | |||
| @@ -116,14 +116,14 @@ local function require_json() | |||
| 116 | return nil | 116 | return nil |
| 117 | end | 117 | end |
| 118 | 118 | ||
| 119 | local ltn12_ok, ltn12 = pcall(require, "ltn12") | ||
| 120 | if not ltn12_ok then -- If not using LuaSocket and/or LuaSec... | ||
| 121 | |||
| 122 | local function redact_api_url(url) | 119 | local function redact_api_url(url) |
| 123 | url = tostring(url) | 120 | url = tostring(url) |
| 124 | return (url:gsub(".*/api/[^/]+/[^/]+", "")) or "" | 121 | return (url:gsub(".*/api/[^/]+/[^/]+", "")) or "" |
| 125 | end | 122 | end |
| 126 | 123 | ||
| 124 | local ltn12_ok, ltn12 = pcall(require, "ltn12") | ||
| 125 | if not ltn12_ok then -- If not using LuaSocket and/or LuaSec... | ||
| 126 | |||
| 127 | function Api:request(url, params, post_params) | 127 | function Api:request(url, params, post_params) |
| 128 | local vars = cfg.variables | 128 | local vars = cfg.variables |
| 129 | local json_ok, json = require_json() | 129 | local json_ok, json = require_json() |