From 1eee434b7e6313e721f8ff638f7b78cfb21960db Mon Sep 17 00:00:00 2001
From: Hisham Muhammad <hisham@gobolinux.org>
Date: Tue, 19 Jun 2018 11:14:56 -0300
Subject: cmd: move local functions inside

---
 src/luarocks/cmd.lua | 43 ++++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/luarocks/cmd.lua b/src/luarocks/cmd.lua
index 1b069d59..51d22154 100644
--- a/src/luarocks/cmd.lua
+++ b/src/luarocks/cmd.lua
@@ -22,27 +22,6 @@ cmd.errorcodes = {
    CRASH = 99
 }
 
-local function error_handler(err)
-   return debug.traceback("LuaRocks "..cfg.program_version..
-      " bug (please report at https://github.com/luarocks/luarocks/issues).\n"..err, 2)
-end
-
---- Display an error message and exit.
--- @param message string: The error message.
--- @param exitcode number: the exitcode to use
-local function die(message, exitcode)
-   assert(type(message) == "string", "bad error, expected string, got: " .. type(message))
-   util.printerr("\nError: "..message)
-
-   local ok, err = xpcall(util.run_scheduled_functions, error_handler)
-   if not ok then
-      util.printerr("\nError: "..err)
-      exitcode = cmd.errorcodes.CRASH
-   end
-
-   os.exit(exitcode or cmd.errorcodes.UNSPECIFIED)
-end
-
 local function replace_tree(flags, tree)
    tree = dir.normalize(tree)
    flags["tree"] = tree
@@ -81,6 +60,28 @@ end
 -- the loaded modules representing commands.
 -- @param ... string: Arguments given on the command-line.
 function cmd.run_command(description, commands, ...)
+
+   local function error_handler(err)
+      return debug.traceback("LuaRocks "..cfg.program_version..
+         " bug (please report at https://github.com/luarocks/luarocks/issues).\n"..err, 2)
+   end
+
+   --- Display an error message and exit.
+   -- @param message string: The error message.
+   -- @param exitcode number: the exitcode to use
+   local function die(message, exitcode)
+      assert(type(message) == "string", "bad error, expected string, got: " .. type(message))
+      util.printerr("\nError: "..message)
+
+      local ok, err = xpcall(util.run_scheduled_functions, error_handler)
+      if not ok then
+         util.printerr("\nError: "..err)
+         exitcode = cmd.errorcodes.CRASH
+      end
+
+      os.exit(exitcode or cmd.errorcodes.UNSPECIFIED)
+   end
+
    local args = {...}
    local cmdline_vars = {}
    for i = #args, 1, -1 do
-- 
cgit v1.2.3-55-g6feb