From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp43.i.mail.ru (smtp43.i.mail.ru [94.100.177.103]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 0CB1A4696C4 for ; Thu, 9 Apr 2020 09:33:38 +0300 (MSK) From: Leonid Vasiliev Date: Thu, 9 Apr 2020 09:33:33 +0300 Message-Id: <1b51b2fe1c194719a7a8a74220a954a91c21f2a7.1586412430.git.lvasiliev@tarantool.org> In-Reply-To: References: MIME-Version: 1.0 In-Reply-To: References: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH v3 2/2] Delete flags which can't be used with tarantoolctl rocks List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: v.shpilevoy@tarantool.org Cc: tarantool-patches@dev.tarantool.org --- 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= Restrict downloads to paths matching the given URL. - --lua-dir= Which Lua installation to use. - --lua-version= Which Lua version to use. --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= 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"] = "", - ["global"] = true, ["help"] = true, ["home"] = true, ["homepage"] = "\"\"", @@ -113,14 +112,11 @@ local supported_flags = { ["lib"] = "", ["license"] = "\"\"", ["list"] = true, - ["local"] = true, ["local-tree"] = true, ["lr-bin"] = true, ["lr-cpath"] = true, ["lr-path"] = true, - ["lua-dir"] = "", ["lua-version"] = "", - ["lua-versions"] = "", ["lua-ver"] = true, ["lua-incdir"] = true, ["lua-libdir"] = true, -- 2.7.4