Software /
code /
prosody
Diff
tools/migration/prosody-migrator.lua @ 7885:236b5a6154b2
Merge 0.10->trunk
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Sat, 04 Feb 2017 01:08:27 +0100 |
parent | 7880:1d998891c967 |
child | 7893:432f721b0fdf |
line wrap: on
line diff
--- a/tools/migration/prosody-migrator.lua Sun Jan 29 22:32:03 2017 +0100 +++ b/tools/migration/prosody-migrator.lua Sat Feb 04 01:08:27 2017 +0100 @@ -40,22 +40,13 @@ 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 - return envloadfile(file, env); - end -end - local config_file = options.config or default_config; local from_store = arg[1] or "input"; local to_store = arg[2] or "output"; config = {}; local config_env = setmetatable({}, { __index = function(t, k) return function(tbl) config[k] = tbl; end; end }); -local config_chunk, err = loadfilein(config_file, config_env); +local config_chunk, err = envloadfile(config_file, config_env); if not config_chunk then print("There was an error loading the config file, check the file exists"); print("and that the syntax is correct:");