Merge branch 'master' of https://github.com/keplerproject/luarocks

2 files changed, 6 insertions, 3 deletions

diff --git a/src/luarocks/help.lua b/src/luarocks/help.lua
index 28f97702..871e97e9 100644
--- a/src/luarocks/help.lua
+++ b/src/luarocks/help.lua
@@ -65,7 +65,7 @@ function help.command(flags, command)
         --verbose              Display verbose output of commands executed.
         --timeout=<seconds>    Timeout on network operations, in seconds.
                                0 means no timeout (wait forever).
-                               Default is ]]..cfg.connection_timeout..[[.]])
+                               Default is ]]..tostring(cfg.connection_timeout)..[[.]])
       print_section("VARIABLES")
       util.printout([[
         Variables from the "variables" table of the configuration file
diff --git a/src/luarocks/type_check.lua b/src/luarocks/type_check.lua
index 82763401..63c59ca2 100644
--- a/src/luarocks/type_check.lua
+++ b/src/luarocks/type_check.lua
@@ -234,9 +234,12 @@ end
 
 local function mkfield(context, field)
    if context == "" then
-      return field
+      return tostring(field)
+   elseif type(field) == "string" then
+      return context.."."..field
+   else
+      return context.."["..tostring(field).."]"
    end
-   return context.."."..field
 end
 
 --- Type check the contents of a table.