diff options
| author | Matthew Wild <mwild1@gmail.com> | 2011-06-03 00:58:09 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2011-06-03 00:58:09 +0100 |
| commit | 648ce900d7f396770747c864758c20c04c77d143 (patch) | |
| tree | c714d4a7da3a44ffa9e988531b178b8c0693d73b /tools/migration/migrator/prosody_files.lua | |
| parent | c3c3bd3a5d36d36a0ee31a660ad3efd2d1a2a86d (diff) | |
| parent | 27bc9300b89d76c5ef59e13653a9d67267830522 (diff) | |
| download | prosody-648ce900d7f396770747c864758c20c04c77d143.tar.gz prosody-648ce900d7f396770747c864758c20c04c77d143.zip | |
Merge 0.8->trunk
Diffstat (limited to 'tools/migration/migrator/prosody_files.lua')
| -rw-r--r-- | tools/migration/migrator/prosody_files.lua | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/migration/migrator/prosody_files.lua b/tools/migration/migrator/prosody_files.lua index 4e42f564..be0c49f8 100644 --- a/tools/migration/migrator/prosody_files.lua +++ b/tools/migration/migrator/prosody_files.lua @@ -98,7 +98,12 @@ function reader(input) local x = iter(); if x then dm.set_data_path(path); - x.data = assert(dm.load(x.user, x.host, x.store)); + local err; + x.data, err = dm.load(x.user, x.host, x.store); + if x.data == nil and err then + error(("Error loading data at path %s for %s@%s (%s store)") + :format(path, x.user or "<nil>", x.host or "<nil>", x.store or "<nil>"), 0); + end return x; end end; |