[Tarantool-patches] [PATCH v3 2/2] Delete flags which can't be used with tarantoolctl rocks

Leonid Vasiliev lvasiliev at tarantool.org
Thu Apr 9 09:33:33 MSK 2020


---
Added changes according to https://lists.tarantool.org/pipermail/tarantool-patches/2020-April/015459.html
I discussed the transfer of the blacklist to Luaroсks with
Alexander Turenko at the beginning of the assignment and
was decided that it's overkill since we already have patches specific for tarantool.

 src/luarocks/cmd/help.lua | 5 -----
 src/luarocks/util.lua     | 4 ----
 2 files changed, 9 deletions(-)

diff --git a/src/luarocks/cmd/help.lua b/src/luarocks/cmd/help.lua
index dcc9e35..202fe43 100644
--- a/src/luarocks/cmd/help.lua
+++ b/src/luarocks/cmd/help.lua
@@ -62,12 +62,7 @@ function help.command(description, commands, command)
 	                       (overrides any entries in the config file)
 	--only-sources=<url>   Restrict downloads to paths matching the
 	                       given URL.
-        --lua-dir=<prefix>     Which Lua installation to use.
-	--lua-version=<ver>    Which Lua version to use.
 	--tree=<tree>          Which tree to operate on.
-	--local                Use the tree in the user's home directory.
-	                       To enable it, see ']]..program..[[ help path'.
-	--global               Use the system tree when `local_by_default` is `true`.
 	--verbose              Display verbose output of commands executed.
 	--timeout=<seconds>    Timeout on network operations, in seconds.
 	                       0 means no timeout (wait forever).
diff --git a/src/luarocks/util.lua b/src/luarocks/util.lua
index 8ccda27..96d4536 100644
--- a/src/luarocks/util.lua
+++ b/src/luarocks/util.lua
@@ -101,7 +101,6 @@ local supported_flags = {
    ["force"] = true,
    ["force-fast"] = true,
    ["from"] = "<server>",
-   ["global"] = true,
    ["help"] = true,
    ["home"] = true,
    ["homepage"] = "\"<url>\"",
@@ -113,14 +112,11 @@ local supported_flags = {
    ["lib"] = "<library>",
    ["license"] = "\"<text>\"",
    ["list"] = true,
-   ["local"] = true,
    ["local-tree"] = true,
    ["lr-bin"] = true,
    ["lr-cpath"] = true,
    ["lr-path"] = true,
-   ["lua-dir"] = "<path>",
    ["lua-version"] = "<vers>",
-   ["lua-versions"] = "<versions>",
    ["lua-ver"] = true,
    ["lua-incdir"] = true,
    ["lua-libdir"] = true,
-- 
2.7.4



More information about the Tarantool-patches mailing list