From 1a85cb5c7d23e041d2787e097fecbd4524a86792 Mon Sep 17 00:00:00 2001
From: Thijs Schreijer <thijs@thijsschreijer.nl>
Date: Thu, 25 Jun 2015 00:29:28 +0200
Subject: fix travis-ci error

---
 src/luarocks/cfg.lua | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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
       io.stderr:write(err.."\n")
       os.exit(cfg.errorcodes.CONFIGFILE)
    end
-   merge_overrides(sys_config_ok)
+   if sys_config_ok then 
+      merge_overrides(sys_config_ok)
+   end
 end
 
 if not site_config.LUAROCKS_FORCE_CONFIG then
-- 
cgit v1.2.3-55-g6feb