Get rid of util.forward_flags

Use 'commands' functions directly.

2 files changed, 2 insertions, 34 deletions

diff --git a/src/luarocks/install.lua b/src/luarocks/install.lua
index d961f525..acbf584a 100644
--- a/src/luarocks/install.lua
+++ b/src/luarocks/install.lua
@@ -160,7 +160,7 @@ function install.command(flags, name, version)
 
    if name:match("%.rockspec$") or name:match("%.src%.rock$") then
       local build = require("luarocks.build")
-      return build.run(name, util.forward_flags(flags, "local", "keep", "deps-mode", "only-deps", "force", "force-fast"))
+      return build.command(flags, name)
    elseif name:match("%.rock$") then
       if flags["only-deps"] then
          ok, err = install.install_binary_rock_deps(name, deps.get_deps_mode(flags))
@@ -181,7 +181,7 @@ function install.command(flags, name, version)
          return nil, err
       end
       util.printout("Installing "..url)
-      return install.run(url, util.forward_flags(flags))
+      return install.command(flags, url)
    end
 end
 
diff --git a/src/luarocks/util.lua b/src/luarocks/util.lua
index 6aff5324..532bea8b 100644
--- a/src/luarocks/util.lua
+++ b/src/luarocks/util.lua
@@ -196,38 +196,6 @@ function util.parse_flags(...)
    return flags, unpack(out)
 end
 
---- Build a sequence of flags for forwarding from one command to
--- another (for example, from "install" to "build").
--- @param flags table: A table of parsed flags
--- @param ... string...: A variable number of flags to be checked
--- in the flags table. If no flags are passed as varargs, the
--- entire flags table is forwarded.
--- @return string... A variable number of strings
-function util.forward_flags(flags, ...)
-   assert(type(flags) == "table")
-   local out = {}
-   local filter = select('#', ...)
-   local function add_flag(flagname)
-      if flags[flagname] then
-         if flags[flagname] == true then
-            table.insert(out, "--"..flagname)
-         else
-            table.insert(out, "--"..flagname.."="..flags[flagname])
-         end
-      end
-   end
-   if filter > 0 then
-      for i = 1, filter do
-         add_flag(select(i, ...))
-      end
-   else
-      for flagname, _ in pairs(flags) do
-         add_flag(flagname)
-      end
-   end
-   return unpack(out)
-end
-
 -- Adds legacy 'run' function to a command module.
 -- @param command table: command module with 'command' function,
 -- the added 'run' function calls it after parseing command-line arguments.