Merge branch 'master' into luarocks-3

6 files changed, 16 insertions, 8 deletions

diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua
index 42508b9e..73bff097 100644
--- a/src/luarocks/core/cfg.lua
+++ b/src/luarocks/core/cfg.lua
@@ -406,7 +406,7 @@ local defaults = {
 
 if cfg.platforms.windows then
    local full_prefix = (site_config.LUAROCKS_PREFIX or (os.getenv("PROGRAMFILES")..[[\LuaRocks]]))
-   extra_luarocks_module_dir = full_prefix.."\\lua\\?.lua"
+   extra_luarocks_module_dir = full_prefix.."/lua/?.lua"
 
    home_config_file = home_config_file and home_config_file:gsub("\\","/")
    defaults.fs_use_modules = false
diff --git a/src/luarocks/fs/win32.lua b/src/luarocks/fs/win32.lua
index c03db6a0..9ce95986 100644
--- a/src/luarocks/fs/win32.lua
+++ b/src/luarocks/fs/win32.lua
@@ -130,6 +130,8 @@ function win32.wrap_script(file, dest, name, version)
    local wrapname = fs.is_dir(dest) and dest.."/"..base or dest
    wrapname = wrapname..".bat"
    local lpath, lcpath = cfg.package_paths()
+   lpath = util.remove_path_dupes(lpath, ";")
+   lcpath = util.remove_path_dupes(lcpath, ";")
    local wrapper = io.open(wrapname, "w")
    if not wrapper then
       return nil, "Could not open "..wrapname.." for writing."
diff --git a/src/luarocks/help.lua b/src/luarocks/help.lua
index 51e2cf57..d27c3a50 100644
--- a/src/luarocks/help.lua
+++ b/src/luarocks/help.lua
@@ -64,7 +64,7 @@ function help.command(flags, command)
         --verbose              Display verbose output of commands executed.
         --timeout=<seconds>    Timeout on network operations, in seconds.
                                0 means no timeout (wait forever).
-                               Default is ]]..cfg.connection_timeout..[[.]])
+                               Default is ]]..tostring(cfg.connection_timeout)..[[.]])
       print_section("VARIABLES")
       util.printout([[
         Variables from the "variables" table of the configuration file
diff --git a/src/luarocks/new_version.lua b/src/luarocks/new_version.lua
index eb5dea25..000b459b 100644
--- a/src/luarocks/new_version.lua
+++ b/src/luarocks/new_version.lua
@@ -133,15 +133,19 @@ function new_version.command(flags, input, version, url)
    end
    assert(type(input) == "string")
    
-   local filename = input
-   if not input:match("rockspec$") then
-      local err
+   local filename, err
+   if input:match("rockspec$") then
+      filename, err = fetch.fetch_url(input)
+      if not filename then
+         return nil, err
+      end
+   else
       filename, err = download.download("rockspec", input)
       if not filename then
          return nil, err
       end
    end
-   
+
    local valid_rs, err = fetch.load_rockspec(filename)
    if not valid_rs then
       return nil, err
@@ -167,7 +171,7 @@ function new_version.command(flags, input, version, url)
    end
    local new_rockver = new_ver:gsub("-", "")
    
-   local out_rs = persist.load_into_table(filename)
+   local out_rs, err = persist.load_into_table(filename)
    local out_name = out_rs.package:lower()
    out_rs.version = new_rockver.."-"..new_rev
 
diff --git a/src/luarocks/unpack.lua b/src/luarocks/unpack.lua
index 22b3f49b..af3398ab 100644
--- a/src/luarocks/unpack.lua
+++ b/src/luarocks/unpack.lua
@@ -44,7 +44,6 @@ local function unpack_rockspec(rockspec_file, dir_name)
    if not ok then return nil, err end
    ok, err = build.apply_patches(rockspec)
    fs.pop_dir()
-   fs.pop_dir()
    if not ok then return nil, err end
    return rockspec
 end
diff --git a/src/luarocks/upload.lua b/src/luarocks/upload.lua
index 4bda4303..baee47ab 100644
--- a/src/luarocks/upload.lua
+++ b/src/luarocks/upload.lua
@@ -75,6 +75,9 @@ function upload.command(flags, fname)
    local module_url = res.module_url
    
    if rock_fname then
+      if (not res.version) or (not res.version.id) then
+         return nil, "Invalid response from server."
+      end
       util.printout(("Sending " .. tostring(rock_fname) .. " ..."))
       res, err = api:method("upload_rock/" .. ("%d"):format(res.version.id), nil, {
          rock_file = multipart.new_file(rock_fname)