From d5ebef1362dcd7c84bb2af88f6aadc4dd3586570 Mon Sep 17 00:00:00 2001
From: Badlop <badlop@process-one.net>
Date: Thu, 8 Dec 2011 19:39:36 +0100
Subject: [PATCH] Fix command "update" to return response in the expected
 format

---
 src/ejabberd_admin.erl  | 5 +++--
 src/ejabberd_update.erl | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/ejabberd_admin.erl b/src/ejabberd_admin.erl
index 2b2bfe44f..4b8fc3958 100644
--- a/src/ejabberd_admin.erl
+++ b/src/ejabberd_admin.erl
@@ -312,14 +312,15 @@ update_list() ->
     [atom_to_list(Beam) || Beam <- UpdatedBeams].
 
 update("all") ->
-    [update_module(ModStr) || ModStr <- update_list()];
+    [update_module(ModStr) || ModStr <- update_list()],
+    {ok, []};
 update(ModStr) ->
     update_module(ModStr).
 
 update_module(ModuleNameString) ->
     ModuleName = list_to_atom(ModuleNameString),
     case ejabberd_update:update([ModuleName]) of
-          {ok, Res} -> {ok, io_lib:format("Updated: ~p", [Res])};
+          {ok, _Res} -> {ok, []};
           {error, Reason} -> {error, Reason}
     end.
 
diff --git a/src/ejabberd_update.erl b/src/ejabberd_update.erl
index f88af2aca..6bb354818 100644
--- a/src/ejabberd_update.erl
+++ b/src/ejabberd_update.erl
@@ -44,7 +44,7 @@ update() ->
 		eval_script(
 		  LowLevelScript, [],
 		  [{ejabberd, "", filename:join(Dir, "..")}]),
-	    ?INFO_MSG("eval: ~p~n", [Eval]),
+	    ?DEBUG("eval: ~p~n", [Eval]),
 	    Eval;
 	{error, Reason} ->
 	    {error, Reason}
@@ -61,7 +61,7 @@ update(ModulesToUpdate) ->
 		eval_script(
 		  LowLevelScript, [],
 		  [{ejabberd, "", filename:join(Dir, "..")}]),
-	    ?INFO_MSG("eval: ~p~n", [Eval]),
+	    ?DEBUG("eval: ~p~n", [Eval]),
 	    Eval;
 	{error, Reason} ->
 	    {error, Reason}