From 07fdd089a081201ae5fc4673d72797e8fc9e66e7 Mon Sep 17 00:00:00 2001 From: Badlop Date: Wed, 14 Sep 2011 12:15:53 +0200 Subject: [PATCH] No need to explicitly skip old useless tables, simply fix keep_tables --- src/ejabberd_admin.erl | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/ejabberd_admin.erl b/src/ejabberd_admin.erl index 9ceaa1836..a11b4bf4a 100644 --- a/src/ejabberd_admin.erl +++ b/src/ejabberd_admin.erl @@ -427,18 +427,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