[Tarantool-patches] [PATCH v2 2/3] Add a black list for tarantoolctl rocks options

[Leonid Vasiliev]

---
 src/luarocks/cmd/help.lua |  5 -----
 src/luarocks/util.lua     | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 5 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..895747c 100644
--- a/src/luarocks/util.lua
+++ b/src/luarocks/util.lua
@@ -171,6 +171,14 @@ local supported_flags = {
    ["version"] = true,
 }
 
+-- The tarantool unsupported arguments list.
+local tarantool_black_list = {
+   ["global"] = true,
+   ["local"] = true,
+   ["lua-version"] = true,
+   ["lua-dir"] = true,
+}
+
 --- Extract flags from an arguments list.
 -- Given string arguments, extract flag arguments into a flags set.
 -- For example, given "foo", "--tux=beep", "--bla", "bar", "--baz",
@@ -189,6 +197,9 @@ function util.parse_flags(...)
       elseif state == "initial" and flag then
          local var,val = flag:match("([a-z_%-]*)=(.*)")
          if val then
+            if tarantool_black_list[var] then
+               return { ERROR = "Invalid argument: flag --"..var.." is not supported by tarantoolctl rocks." }
+            end
             local vartype = supported_flags[var]
             if type(vartype) == "string" then
                if val == "" and vartype:sub(1,1) ~= '"' then
@@ -204,6 +215,9 @@ function util.parse_flags(...)
             end
          else
             local var = flag
+            if tarantool_black_list[var] then
+               return { ERROR = "Invalid argument: flag --"..var.." is not supported by tarantoolctl rocks." }
+            end
             local vartype = supported_flags[var]
             if type(vartype) == "string" then
                i = i + 1
-- 
2.7.4