Tarantool development patches archive
 help / color / mirror / Atom feed
From: Leonid Vasiliev <lvasiliev@tarantool.org>
To: v.shpilevoy@tarantool.org
Cc: tarantool-patches@dev.tarantool.org
Subject: [Tarantool-patches] [PATCH v3 2/2] Delete flags which can't be used with tarantoolctl rocks
Date: Thu,  9 Apr 2020 09:33:33 +0300	[thread overview]
Message-ID: <1b51b2fe1c194719a7a8a74220a954a91c21f2a7.1586412430.git.lvasiliev@tarantool.org> (raw)
In-Reply-To: <cover.1586412430.git.lvasiliev@tarantool.org>
In-Reply-To: <cover.1586412430.git.lvasiliev@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=<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

  parent reply	other threads:[~2020-04-09  6:33 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-09  6:33 [Tarantool-patches] [PATCH v3 0/2] Adapt luarocks for tarantoolctl Leonid Vasiliev
2020-04-09  6:33 ` [Tarantool-patches] [PATCH v3 1/2] Add the chdir option for make Leonid Vasiliev
2020-04-09  6:33 ` Leonid Vasiliev [this message]
2020-04-13 11:59   ` [Tarantool-patches] [PATCH v3 2/2] Delete flags which can't be used with tarantoolctl rocks lvasiliev
2020-04-13 12:16     ` Yaroslav Dynnikov
2020-04-10  0:00 ` [Tarantool-patches] [PATCH v3 0/2] Adapt luarocks for tarantoolctl Vladislav Shpilevoy
2020-04-10  8:41   ` lvasiliev
2020-04-10 17:02   ` Yaroslav Dynnikov
2020-04-10 18:37     ` lvasiliev
2020-04-11 14:23     ` Vladislav Shpilevoy
2020-04-12 17:25       ` lvasiliev
2020-04-12 18:30         ` Yaroslav Dynnikov
2020-04-12 19:52           ` Vladislav Shpilevoy
2020-04-13  7:44           ` lvasiliev
2020-04-13 11:07 ` lvasiliev

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1b51b2fe1c194719a7a8a74220a954a91c21f2a7.1586412430.git.lvasiliev@tarantool.org \
    --to=lvasiliev@tarantool.org \
    --cc=tarantool-patches@dev.tarantool.org \
    --cc=v.shpilevoy@tarantool.org \
    --subject='Re: [Tarantool-patches] [PATCH v3 2/2] Delete flags which can'\''t be used with tarantoolctl rocks' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox