diff options
author | Kim Alvefur <zash@zash.se> | 2017-02-02 20:11:25 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-02-02 20:11:25 +0100 |
commit | f0918f4e1b59ca6f360a4b1ae2974a9c339e71a1 (patch) | |
tree | c4ac3cd7bbda80dd03730b407332b23da4fb4c43 | |
parent | 49c6a0dd6fed572562840d7fcc9416c3663551d0 (diff) | |
download | prosody-f0918f4e1b59ca6f360a4b1ae2974a9c339e71a1.tar.gz prosody-f0918f4e1b59ca6f360a4b1ae2974a9c339e71a1.zip |
migrator: Remove wrapper around envloadfile since envloadfile does the right thing in a compatible way
-rw-r--r-- | tools/migration/prosody-migrator.lua | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/tools/migration/prosody-migrator.lua b/tools/migration/prosody-migrator.lua index b86e9892..8560ddb5 100644 --- a/tools/migration/prosody-migrator.lua +++ b/tools/migration/prosody-migrator.lua @@ -40,22 +40,13 @@ 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 - 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:"); |