diff options
| author | Kim Alvefur <zash@zash.se> | 2017-04-08 00:48:15 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-04-08 00:48:15 +0200 |
| commit | f2f1aa7473e3e9c668a77044c93560e3c914cc50 (patch) | |
| tree | bc8f7022567cc5611e86b0f5636e9d8f9f35e46f /tools/migration/prosody-migrator.lua | |
| parent | 5354e5645ec328120cadd24a7dfa7139fd07ec60 (diff) | |
| parent | 6b3a33a0835f774ab7e0f021d885b47b7631b7c4 (diff) | |
| download | prosody-f2f1aa7473e3e9c668a77044c93560e3c914cc50.tar.gz prosody-f2f1aa7473e3e9c668a77044c93560e3c914cc50.zip | |
Merge 0.10->trunk
Diffstat (limited to 'tools/migration/prosody-migrator.lua')
| -rw-r--r-- | tools/migration/prosody-migrator.lua | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/tools/migration/prosody-migrator.lua b/tools/migration/prosody-migrator.lua index 6cff9f67..1219d891 100644 --- a/tools/migration/prosody-migrator.lua +++ b/tools/migration/prosody-migrator.lua @@ -77,13 +77,8 @@ function load_store_handler(name) else local ok, err = pcall(require, "migrator."..store_type); if not ok then - if package.loaded["migrator."..store_type] then - print(("Error: Failed to initialize '%s' store:\n\t%s") - :format(name, err)); - else - print(("Error: Unrecognised store type for '%s': %s") - :format(from_store, store_type)); - end + print(("Error: Failed to initialize '%s' store:\n\t%s") + :format(name, err)); return false; end end |