diff options
-rw-r--r-- | appveyor.yml | 2 | ||||
-rw-r--r-- | install.bat | 2 | ||||
-rw-r--r-- | src/luarocks/upload/api.lua | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/appveyor.yml b/appveyor.yml index 436c341b..140308ce 100644 --- a/appveyor.yml +++ b/appveyor.yml | |||
@@ -12,7 +12,7 @@ environment: | |||
12 | - LUA_VER: 5.1.5 | 12 | - LUA_VER: 5.1.5 |
13 | - LUA_VER: 5.2.4 | 13 | - LUA_VER: 5.2.4 |
14 | - LUA_VER: 5.3.0 | 14 | - LUA_VER: 5.3.0 |
15 | - LJ_VER: 2.0.3 | 15 | - LJ_VER: 2.0.4 |
16 | - LJ_VER: 2.1 | 16 | - LJ_VER: 2.1 |
17 | 17 | ||
18 | init: | 18 | init: |
diff --git a/install.bat b/install.bat index ffde28db..d81a25a7 100644 --- a/install.bat +++ b/install.bat | |||
@@ -319,7 +319,7 @@ local function look_for_interpreter (directory) | |||
319 | return true | 319 | return true |
320 | end | 320 | end |
321 | end | 321 | end |
322 | print(" No Lua interpreter found") | 322 | --print(" No Lua interpreter found") |
323 | return false | 323 | return false |
324 | end | 324 | end |
325 | 325 | ||
diff --git a/src/luarocks/upload/api.lua b/src/luarocks/upload/api.lua index ba4aaff4..2cf462fb 100644 --- a/src/luarocks/upload/api.lua +++ b/src/luarocks/upload/api.lua | |||
@@ -10,11 +10,11 @@ local multipart = require("luarocks.upload.multipart") | |||
10 | local Api = {} | 10 | local Api = {} |
11 | 11 | ||
12 | local function upload_config_file() | 12 | local function upload_config_file() |
13 | local _, _, home_conf, home_ok = cfg.which_config() | 13 | local conf = cfg.which_config() |
14 | if not home_conf then | 14 | if not conf.user.file then |
15 | return nil | 15 | return nil |
16 | end | 16 | end |
17 | return (home_conf:gsub("/[^/]+$", "/upload_config.lua")) | 17 | return (conf.user.file:gsub("/[^/]+$", "/upload_config.lua")) |
18 | end | 18 | end |
19 | 19 | ||
20 | function Api:load_config() | 20 | function Api:load_config() |
@@ -254,7 +254,7 @@ end | |||
254 | 254 | ||
255 | end | 255 | end |
256 | 256 | ||
257 | function api.new(flags, name) | 257 | function api.new(flags) |
258 | local self = {} | 258 | local self = {} |
259 | setmetatable(self, { __index = Api }) | 259 | setmetatable(self, { __index = Api }) |
260 | self.config = self:load_config() or {} | 260 | self.config = self:load_config() or {} |