Merge branch 'master' into multitree

4 files changed, 24 insertions, 43 deletions

diff --git a/src/luarocks/command_line.lua b/src/luarocks/command_line.lua
index 8fa9073c..d08ffdfe 100644
--- a/src/luarocks/command_line.lua
+++ b/src/luarocks/command_line.lua
@@ -21,18 +21,6 @@ local function die(message)
    os.exit(1)
 end
 
-local function is_writable(tree)
-  if type(tree) == "string" then
-    return fs.make_dir(tree) and fs.is_writable(tree)
-  else
-    writable = true
-    for k, v in pairs(tree) do
-      writable = writable and fs.make_dir(v) and fs.is_writable(v)
-    end
-    return writable
-  end
-end
-
 --- Main command-line processor.
 -- Parses input arguments and calls the appropriate driver function
 -- to execute the action requested on the command-line, forwarding
diff --git a/src/luarocks/fs/lua.lua b/src/luarocks/fs/lua.lua
index 879b5d75..cd199fbb 100644
--- a/src/luarocks/fs/lua.lua
+++ b/src/luarocks/fs/lua.lua
@@ -664,13 +664,18 @@ function check_command_permissions(flags)
    local root_dir = path.root_dir(cfg.rocks_dir)
    local ok = true
    local err = ""
-   for _, dir in ipairs { cfg.rocks_dir, root_dir, dir.dir_name(root_dir) } do
+   for _, dir in ipairs { cfg.rocks_dir, root_dir } do
       if fs.exists(dir) and not fs.is_writable(dir) then
          ok = false
          err = "Your user does not have write permissions in " .. dir
          break
       end
    end
+   local root_parent = dir.dir_name(root_dir)
+   if ok and not fs.exists(root_dir) and not fs.is_writable(root_parent) then
+      ok = false
+      err = root_dir.." does not exist and your user does not have write permissions in " .. root_parent
+   end
    if ok then
       return true
    else
diff --git a/src/luarocks/search.lua b/src/luarocks/search.lua
index 4e0318c7..ec0fa69c 100644
--- a/src/luarocks/search.lua
+++ b/src/luarocks/search.lua
@@ -287,9 +287,7 @@ end
 -- @param results table: A table where keys are package names and versions
 -- are tables matching version strings to an array of rocks servers.
 -- @param show_repo boolean or nil: Whether to show repository
--- @param long boolean or nil: Whether to show module files
--- information or not. Default is true.
-function print_results(results, show_repo, long)
+function print_results(results, show_repo)
    assert(type(results) == "table")
    assert(type(show_repo) == "boolean" or not show_repo)
    -- Force display of repo location for the time being
diff --git a/src/luarocks/util.lua b/src/luarocks/util.lua
index 46802255..67a3778a 100644
--- a/src/luarocks/util.lua
+++ b/src/luarocks/util.lua
@@ -344,33 +344,23 @@ function remove_path_dupes(list, sep)
    return table.concat(final, sep)
 end
 
---[[
-Author: Julio Manuel Fernandez-Diaz
-Date:   January 12, 2007
-(For Lua 5.1)
-
-Formats tables with cycles recursively to any depth.
-The output is returned as a string.
-References to other tables are shown as values.
-Self references are indicated.
-
-The string returned is "Lua code", which can be procesed
-(in the case in which indent is composed by spaces or "--").
-Userdata and function keys and values are shown as strings,
-which logically are exactly not equivalent to the original code.
-
-This routine can serve for pretty formating tables with
-proper indentations, apart from printing them:
-
-io.write(table.show(t, "t"))   -- a typical use
-
-Heavily based on "Saving tables with cycles", PIL2, p. 113.
-
-Arguments:
-t is the table.
-name is the name of the table (optional)
-indent is a first indentation (optional).
---]]
+---
+-- Formats tables with cycles recursively to any depth.
+-- References to other tables are shown as values.
+-- Self references are indicated.
+-- The string returned is "Lua code", which can be procesed
+-- (in the case in which indent is composed by spaces or "--").
+-- Userdata and function keys and values are shown as strings,
+-- which logically are exactly not equivalent to the original code.
+-- This routine can serve for pretty formating tables with
+-- proper indentations, apart from printing them:
+-- io.write(table.show(t, "t"))   -- a typical use
+-- Written by Julio Manuel Fernandez-Diaz,
+-- Heavily based on "Saving tables with cycles", PIL2, p. 113.
+-- @param t table: is the table.
+-- @param name string: is the name of the table (optional)
+-- @param indent string: is a first indentation (optional).
+-- @return string: the pretty-printed table
 function show_table(t, name, indent)
    local cart     -- a container
    local autoref  -- for self references