[Tarantool-patches] [PATCH 2/3] Add a black list of the tarantoolctl options
Leonid Vasiliev
lvasiliev at tarantool.org
Thu Mar 26 00:50:03 MSK 2020
Luarocks code style has been used
---
src/luarocks/util.lua | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/src/luarocks/util.lua b/src/luarocks/util.lua
index 8ccda27..0172d08 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 roks." }
+ 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 roks." }
+ end
local vartype = supported_flags[var]
if type(vartype) == "string" then
i = i + 1
--
2.7.4
More information about the Tarantool-patches
mailing list