diff options
| author | Thijs Schreijer <thijs@thijsschreijer.nl> | 2015-06-25 00:29:28 +0200 |
|---|---|---|
| committer | Thijs Schreijer <thijs@thijsschreijer.nl> | 2015-06-25 00:29:28 +0200 |
| commit | 1a85cb5c7d23e041d2787e097fecbd4524a86792 (patch) | |
| tree | ce416c1d99cc3bce9ef2a6d24919430d50644062 /src | |
| parent | e87c898a19b54de52e959014377f7658b363b7be (diff) | |
| download | luarocks-1a85cb5c7d23e041d2787e097fecbd4524a86792.tar.gz luarocks-1a85cb5c7d23e041d2787e097fecbd4524a86792.tar.bz2 luarocks-1a85cb5c7d23e041d2787e097fecbd4524a86792.zip | |
fix travis-ci error
Diffstat (limited to 'src')
| -rw-r--r-- | src/luarocks/cfg.lua | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua index 6a49c842..2d3bb8bd 100644 --- a/src/luarocks/cfg.lua +++ b/src/luarocks/cfg.lua | |||
| @@ -182,7 +182,9 @@ do | |||
| 182 | io.stderr:write(err.."\n") | 182 | io.stderr:write(err.."\n") |
| 183 | os.exit(cfg.errorcodes.CONFIGFILE) | 183 | os.exit(cfg.errorcodes.CONFIGFILE) |
| 184 | end | 184 | end |
| 185 | merge_overrides(sys_config_ok) | 185 | if sys_config_ok then |
| 186 | merge_overrides(sys_config_ok) | ||
| 187 | end | ||
| 186 | end | 188 | end |
| 187 | 189 | ||
| 188 | if not site_config.LUAROCKS_FORCE_CONFIG then | 190 | if not site_config.LUAROCKS_FORCE_CONFIG then |
