aboutsummaryrefslogtreecommitdiff
path: root/src/luarocks/cfg.lua
diff options
context:
space:
mode:
Diffstat (limited to 'src/luarocks/cfg.lua')
-rw-r--r--src/luarocks/cfg.lua14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua
index af1062f8..1147d725 100644
--- a/src/luarocks/cfg.lua
+++ b/src/luarocks/cfg.lua
@@ -114,8 +114,11 @@ rocks_trees = {}
114local ok, err = persist.load_into_table(site_config.LUAROCKS_SYSCONFIG or sys_config_file, _M) 114local ok, err = persist.load_into_table(site_config.LUAROCKS_SYSCONFIG or sys_config_file, _M)
115if ok then 115if ok then
116 sys_config_ok = true 116 sys_config_ok = true
117elseif err and ok == nil then 117else -- nil or false
118 io.stderr:write(err.."\n") 118 sys_config_ok = ok
119 if err and ok == nil then
120 io.stderr:write(err.."\n")
121 end
119end 122end
120 123
121if not site_config.LUAROCKS_FORCE_CONFIG then 124if not site_config.LUAROCKS_FORCE_CONFIG then
@@ -131,8 +134,11 @@ if not site_config.LUAROCKS_FORCE_CONFIG then
131 _M.rocks_servers = nil 134 _M.rocks_servers = nil
132 end 135 end
133 util.deep_merge(_M, home_overrides) 136 util.deep_merge(_M, home_overrides)
134 elseif err and home_overrides == nil then 137 else -- nil or false
135 io.stderr:write(err.."\n") 138 home_config_ok = home_overrides
139 if err and home_config_ok == nil then
140 io.stderr:write(err.."\n")
141 end
136 end 142 end
137end 143end
138 144