Merge branch 'master' of https://github.com/keplerproject/luarocks

6 files changed, 11 insertions, 26 deletions

diff --git a/src/luarocks/build/builtin.lua b/src/luarocks/build/builtin.lua
index 00fd09ea..afd05954 100644
--- a/src/luarocks/build/builtin.lua
+++ b/src/luarocks/build/builtin.lua
@@ -174,7 +174,7 @@ function builtin.run(rockspec)
       --TODO EXEWRAPPER
    end
 
-   local ok = true
+   local ok, err
    local built_modules = {}
    local luadir = path.lua_dir(rockspec.name, rockspec.version)
    local libdir = path.lib_dir(rockspec.name, rockspec.version)
@@ -202,7 +202,7 @@ function builtin.run(rockspec)
    for name, info in pairs(build.modules) do
       local moddir = path.module_to_path(name)
       if type(info) == "string" then
-         local ext = info:match(".([^.]+)$")
+         local ext = info:match("%.([^.]+)$")
          if ext == "lua" then
             local filename = dir.base_name(info)
             if info:match("init%.lua$") and not name:match("%.init$") then
@@ -226,7 +226,7 @@ function builtin.run(rockspec)
          if info[1] then sources = info end
          if type(sources) == "string" then sources = {sources} end
          for _, source in ipairs(sources) do
-            local object = source:gsub(".[^.]*$", "."..cfg.obj_extension)
+            local object = source:gsub("%.[^.]*$", "."..cfg.obj_extension)
             if not object then
                object = source.."."..cfg.obj_extension
             end
@@ -236,11 +236,10 @@ function builtin.run(rockspec)
             end
             table.insert(objects, object)
          end
-         if not ok then break end
          local module_name = name:match("([^.]*)$").."."..util.matchquote(cfg.lib_extension)
          if moddir ~= "" then
             module_name = dir.path(moddir, module_name)
-            local ok, err = fs.make_dir(moddir)
+            ok, err = fs.make_dir(moddir)
             if not ok then return nil, err end
          end
          built_modules[module_name] = dir.path(libdir, module_name)
@@ -252,13 +251,13 @@ function builtin.run(rockspec)
    end
    for name, dest in pairs(built_modules) do
       fs.make_dir(dir.dir_name(dest))
-      ok = fs.copy(name, dest)
+      ok, err = fs.copy(name, dest)
       if not ok then
-         return nil, "Failed installing "..name.." in "..dest
+         return nil, "Failed installing "..name.." in "..dest..": "..err
       end
    end
    if fs.is_dir("lua") then
-      local ok, err = fs.copy_contents("lua", luadir)
+      ok, err = fs.copy_contents("lua", luadir)
       if not ok then
          return nil, "Failed copying contents of 'lua' directory: "..err
       end
diff --git a/src/luarocks/cache.lua b/src/luarocks/cache.lua
index dbea8405..fb6344d8 100644
--- a/src/luarocks/cache.lua
+++ b/src/luarocks/cache.lua
@@ -45,25 +45,12 @@ function cache.split_server_url(server, url, user, password)
          user = credentials
       end
    end
-   local local_cache
-   if cfg.local_cache then
-      local_cache = cfg.local_cache .. "/" .. server
-   end
+   local local_cache = cfg.local_cache .. "/" .. server
    return local_cache, protocol, server_path, user, password
 end
 
 function cache.refresh_local_cache(server, url, user, password)
    local local_cache, protocol, server_path, user, password = cache.split_server_url(server, url, user, password)
-
-   local ok, err = fs.make_dir(cfg.local_cache)
-   if not ok then return nil, err end
-
-   local tmp_cache = false
-   if not local_cache then
-      local err
-      local_cache, err = fs.make_temp_dir("local_cache")
-      tmp_cache = true
-   end
    local ok, err = fs.make_dir(local_cache)
    if not ok then
       return nil, "Failed creating local cache dir: "..err
diff --git a/src/luarocks/command_line.lua b/src/luarocks/command_line.lua
index e1c9f492..a016fc72 100644
--- a/src/luarocks/command_line.lua
+++ b/src/luarocks/command_line.lua
@@ -144,7 +144,6 @@ function command_line.run_command(...)
          end
       end
       if not named then
-         local fs = require("luarocks.fs")
          local root_dir = fs.absolute_name(flags["tree"])
          replace_tree(flags, args, root_dir)
       end
diff --git a/src/luarocks/fetch.lua b/src/luarocks/fetch.lua
index e92aeddf..2c028771 100644
--- a/src/luarocks/fetch.lua
+++ b/src/luarocks/fetch.lua
@@ -371,7 +371,7 @@ function fetch.fetch_sources(rockspec, extract, dest_dir)
    local protocol = rockspec.source.protocol
    local ok, proto
    if fetch.is_basic_protocol(protocol) then
-      proto = require("luarocks.fetch")
+      proto = fetch
    else
       ok, proto = pcall(require, "luarocks.fetch."..protocol:gsub("[+-]", "_"))
       if not ok then
diff --git a/src/luarocks/help.lua b/src/luarocks/help.lua
index 92458b2b..5a2681a3 100644
--- a/src/luarocks/help.lua
+++ b/src/luarocks/help.lua
@@ -111,7 +111,7 @@ function help.run(...)
          print_section("SEE ALSO")
          util.printout("","'"..program.." help' for general options and configuration.\n")
       else
-         return nil, "Unknown command '"..command.."'"
+         return nil, "Unknown command: "..command
       end
    end
    return true
diff --git a/src/luarocks/make.lua b/src/luarocks/make.lua
index 1dfe6473..4f70bafe 100644
--- a/src/luarocks/make.lua
+++ b/src/luarocks/make.lua
@@ -54,7 +54,7 @@ function make.run(...)
    
    if not rockspec then
       for file in fs.dir() do
-         if file:match("rockspec$") then
+         if file:match("rockspec$") and fs.is_file(file) then
             if rockspec then
                return nil, "Please specify which rockspec file to use."
             else