summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@rabbitmq.com>2011-02-02 12:31:28 +0000
committerMatthew Sackman <matthew@rabbitmq.com>2011-02-02 12:31:28 +0000
commitb60beb02d6e6bca5e9deb8d65efd0f9d2348ad3c (patch)
tree0c51baa8769dd4b1f7c837d1c55632058321c5d8
parentb89148764e6d45d44c517130612529cdb4fddfc0 (diff)
parent594d856c2c403e69ec921e769dfd3f3c01e8da8f (diff)
downloadrabbitmq-server-git-b60beb02d6e6bca5e9deb8d65efd0f9d2348ad3c.tar.gz
Merging bug23735 to default
-rw-r--r--Makefile1
-rw-r--r--src/rabbit_misc.erl6
2 files changed, 4 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 00bfd62946..0693035ff9 100644
--- a/Makefile
+++ b/Makefile
@@ -314,3 +314,4 @@ endif
ifneq "$(strip $(patsubst clean%,,$(patsubst %clean,,$(TESTABLEGOALS))))" ""
-include $(DEPS_FILE)
endif
+
diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl
index 80c8f4c046..7d9167973d 100644
--- a/src/rabbit_misc.erl
+++ b/src/rabbit_misc.erl
@@ -248,9 +248,9 @@ assert_args_equivalence1(Orig, New, Name, Key) ->
val(undefined) ->
"none";
val({Type, Value}) ->
- Fmt = case Value of
- _ when is_binary (Value) -> "a value '~s' of type '~s'";
- _ -> "a value '~w' of type '~s'"
+ Fmt = case is_binary(Value) of
+ true -> "the value '~s' of type '~s'";
+ false -> "the value '~w' of type '~s'"
end,
lists:flatten(io_lib:format(Fmt, [Value, Type])).