Software / code / prosody
Changeset
7880:1d998891c967
migrator: Remove wrapper around envloadfile since envloadfile does the right thing in a compatible way
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 02 Feb 2017 20:11:25 +0100 |
| parents | 7879:5d0175d3ecf4 |
| children | 7881:4e3067272fae |
| files | tools/migration/prosody-migrator.lua |
| diffstat | 1 files changed, 1 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/tools/migration/prosody-migrator.lua Tue Jan 31 22:49:09 2017 +0100 +++ b/tools/migration/prosody-migrator.lua Thu Feb 02 20:11:25 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:");
