summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2013-01-08 16:28:40 +0000
committerMatthias Radestock <matthias@rabbitmq.com>2013-01-08 16:28:40 +0000
commite72d2281129b64cb49b039bdffd882d0b0df9c87 (patch)
tree544b379cfd5f2edaf1b843034262c78392aff716
parent398f83c28589493ee303a33c11fe4e76c8e0ec6f (diff)
parentf884136a0ccb5462f53f83559d544297f667198d (diff)
downloadrabbitmq-server-git-e72d2281129b64cb49b039bdffd882d0b0df9c87.tar.gz
merge bug25353 into stable
-rw-r--r--src/rabbit_control_main.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rabbit_control_main.erl b/src/rabbit_control_main.erl
index 669a078754..2b7061e8d5 100644
--- a/src/rabbit_control_main.erl
+++ b/src/rabbit_control_main.erl
@@ -168,7 +168,7 @@ start() ->
{'EXIT', {badarg, _}} ->
print_error("invalid parameter: ~p", [Args]),
usage();
- {error, {Problem, Reason}} when is_atom(Problem); is_binary(Reason) ->
+ {error, {Problem, Reason}} when is_atom(Problem), is_binary(Reason) ->
%% We handle this common case specially to avoid ~p since
%% that has i18n issues
print_error("~s: ~s", [Problem, Reason]),