Merge 0.9->trunk

[prosody.git] / tools / migration / prosody-migrator.lua

diff --git a/tools/migration/prosody-migrator.lua b/tools/migration/prosody-migrator.lua
index 2a8bf1c3d445eadae87b046c713df327e838601a..7c933b88118a748cc43f82f01872895b0ce3518a 100644 (file)
--- a/tools/migration/prosody-migrator.lua
+++ b/tools/migration/prosody-migrator.lua
@@ -30,16 +30,22 @@ for i = 1, #arg do
 end
 table.remove(arg, handled_opts);
 
+if CFG_SOURCEDIR then
+       package.path = CFG_SOURCEDIR.."/?.lua;"..package.path;
+       package.cpath = CFG_SOURCEDIR.."/?.so;"..package.cpath;
+else
+       package.path = "../../?.lua;"..package.path
+       package.cpath = "../../?.so;"..package.cpath
+end
+
+local envloadfile = require "util.envload".envloadfile;
+
 -- Load config file
 local function loadfilein(file, env)
        if loadin then
                return loadin(env, io.open(file):read("*a"));
        else
-               local chunk, err = loadfile(file);
-               if chunk then
-                       setfenv(chunk, env);
-               end
-               return chunk, err;
+               return envloadfile(file, env);
        end
 end
 
@@ -59,14 +65,6 @@ end
 
 config_chunk();
 
-if CFG_SOURCEDIR then
-       package.path = CFG_SOURCEDIR.."/?.lua;"..package.path;
-       package.cpath = CFG_SOURCEDIR.."/?.so;"..package.cpath;
-elseif not package.loaded["util.json"] then
-       package.path = "../../?.lua;"..package.path
-       package.cpath = "../../?.so;"..package.cpath
-end
-
 local have_err;
 if #arg > 0 and #arg ~= 2 then
        have_err = true;