From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtpng2.m.smailru.net (smtpng2.m.smailru.net [94.100.179.3]) (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 B23DA469719 for ; Mon, 16 Mar 2020 15:04:17 +0300 (MSK) References: From: Leonid Vasiliev Message-ID: Date: Mon, 16 Mar 2020 15:01:35 +0300 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [Tarantool-patches] [PATCH v2 1/2] luarocks: Add a kludge for option all of luarocks search 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 On 3/16/20 2:50 PM, Leonid Vasiliev wrote: > From: Leonid > > Fixed the tarantoolctl rocks search flag --all > > Forwarding of the --all flag to tarantoolctl rocks module was added. > (Command: tarantoolctl rocks search --all) > > Fixes: #4529 > --- > extra/dist/tarantoolctl.in | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/extra/dist/tarantoolctl.in b/extra/dist/tarantoolctl.in > index 6daf866ac..372838edd 100755 > --- a/extra/dist/tarantoolctl.in > +++ b/extra/dist/tarantoolctl.in > @@ -937,6 +937,7 @@ local function rocks() > local util = require("luarocks.util") > local command_line = require("luarocks.cmd") > local options = keyword_arguments > + > local key = nil > if options["only-server"] ~= nil then > key = find_arg("only%-server") > @@ -945,6 +946,10 @@ local function rocks() > end > table.insert(positional_arguments, key) > > + if positional_arguments[1] == "search" and find_arg("all") then > + table.insert(positional_arguments, "--all") > + end > + > -- Tweak help messages > util.see_help = function(command, program) > -- TODO: print extended help message here > @@ -1400,6 +1405,7 @@ local function populate_arguments() > { 'only-server', 'string' }, > { 'server', 'string' }, > { 'language', 'string' }, > + { 'all', 'boolean' }, > }) > > local cmd_name > diff --git a/extra/dist/tarantoolctl.in b/extra/dist/tarantoolctl.in index c6c3ecb8f..2b95e2957 100755 --- a/extra/dist/tarantoolctl.in +++ b/extra/dist/tarantoolctl.in @@ -937,7 +937,6 @@ local function rocks() local util = require("luarocks.util") local command_line = require("luarocks.cmd") local options = keyword_arguments - local key = nil if options["only-server"] ~= nil then key = find_arg("only%-server")