Diff

tools/migration/prosody-migrator.lua @ 8065:36d9c1226fbc

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 08 Apr 2017 00:48:15 +0200
parent 8062:739bb455cafd
child 10003:4d702f0c6273
line wrap: on
line diff
--- a/tools/migration/prosody-migrator.lua	Tue Apr 04 01:41:09 2017 +0200
+++ b/tools/migration/prosody-migrator.lua	Sat Apr 08 00:48:15 2017 +0200
@@ -77,13 +77,8 @@
 	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