summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2013-01-08 16:48:27 +0000
committerMatthias Radestock <matthias@rabbitmq.com>2013-01-08 16:48:27 +0000
commitf7d65da018f9b7aab3d51f0a74f801ed26966fe4 (patch)
treeab7eb993174d778a9a35bca7359bce2ba1bc0867
parent4baa89636d8f36cb8a1991f4a9059fca16242f83 (diff)
parentbcf6a3dbd53c44f7934418797f3abd164989f8ef (diff)
downloadrabbitmq-server-f7d65da018f9b7aab3d51f0a74f801ed26966fe4.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 669a0787..2b7061e8 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]),