From: Badlop <badlop@process-one.net>
Date: Wed, 14 Sep 2011 10:15:53 +0000 (+0200)
Subject: No need to explicitly skip old useless tables, simply fix keep_tables
X-Git-Tag: v3.0.0-alpha-4~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a435c4b1235846c21e815809c911fc2bd792f365;p=ejabberd

No need to explicitly skip old useless tables, simply fix keep_tables
---

diff --git a/src/ejabberd_admin.erl b/src/ejabberd_admin.erl
index 5d21b124b..2b2bfe44f 100644
--- a/src/ejabberd_admin.erl
+++ b/src/ejabberd_admin.erl
@@ -446,18 +446,14 @@ restore_mnesia(Path) ->
 %% mod_configure/adhoc 
 restore(Path) ->
     mnesia:restore(Path, [{keep_tables,keep_tables()},
-			  {skip_tables, skip_tables()},
 			  {default_op, skip_tables}]).
 
-skip_tables() ->
-    [disco_publish,user_caps,user_caps_resources].
-
 %% This function return a list of tables that should be kept from a previous
 %% version backup.
 %% Obsolete tables or tables created by module who are no longer used are not
 %% restored and are ignored.
 keep_tables() ->
-    lists:flatten([acl, passwd, config, local_config, disco_publish,
+    lists:flatten([acl, passwd, config, local_config,
 		   keep_modules_tables()]).
 
 %% Returns the list of modules tables in use, according to the list of actually