Merge pull request #346 from Tieske/bad_config

bail out on bad config files, fixes #228

2 files changed, 6 insertions, 6 deletions

diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua
index 70c16a2a..ba8c7f22 100644
--- a/src/luarocks/cfg.lua
+++ b/src/luarocks/cfg.lua
@@ -149,11 +149,11 @@ sys_config_file = site_config.LUAROCKS_SYSCONFIG or sys_config_dir.."/config-"..
 local err, errcode
 sys_config_ok, err, errcode = persist.load_into_table(sys_config_file, cfg)
 
-if (not sys_config_ok) and errcode ~= "run" then
+if (not sys_config_ok) and errcode == "open" then -- file not found, so try alternate file
    sys_config_file = sys_config_dir.."/config.lua"
    sys_config_ok, err, errcode = persist.load_into_table(sys_config_file, cfg)
 end
-if (not sys_config_ok) and errcode ~= "open" then
+if (not sys_config_ok) and errcode ~= "open" then -- either "load" or "run"; bad config file, bail out with error
    io.stderr:write(err.."\n")
    os.exit(cfg.errorcodes.CONFIGFILE)
 end
diff --git a/src/luarocks/persist.lua b/src/luarocks/persist.lua
index 04440670..ba3789d1 100644
--- a/src/luarocks/persist.lua
+++ b/src/luarocks/persist.lua
@@ -53,10 +53,10 @@ end
 -- @param filename string: the name of the file.
 -- @param tbl table or nil: if given, this table is used to store
 -- loaded values.
--- @return (table, table) or (nil, string, string): a table with the file's
--- assignments as fields and set of undefined globals accessed in file,
--- or nil, an error message and an error code ("open", "load" or "run") in
--- case of errors.
+-- @return table or (nil, string, string): a table with the file's assignments
+-- as fields, or nil, an error message and an error code ("open"; couldn't open the file,
+-- "load"; compile-time error, or "run"; run-time error)
+-- in case of errors.
 function persist.load_into_table(filename, tbl)
    assert(type(filename) == "string")
    assert(type(tbl) == "table" or not tbl)