diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2011-03-18 17:57:04 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2011-03-18 17:57:04 +0000 |
| commit | 5f295dc115d1d93428377051530f79ca26064c20 (patch) | |
| tree | c3898e71126ab2970a10e712afd570ed5bdd033d | |
| parent | 82ea108bc5c4f17283f0b0080f7dfcf9baea123d (diff) | |
| download | rabbitmq-server-5f295dc115d1d93428377051530f79ca26064c20.tar.gz | |
Well I thought =~= was beautiful and appropriately approximate to ==
| -rw-r--r-- | src/rabbit_mnesia.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_upgrade.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_version.erl | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index 4d3267a2..869f09a1 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -485,7 +485,7 @@ schema_ok_or_move() -> ensure_version_ok({ok, DiscVersion}) -> DesiredVersion = rabbit_version:desired(), - case rabbit_version:'=~='(DesiredVersion, DiscVersion) of + case rabbit_version:matches(DesiredVersion, DiscVersion) of true -> ok; false -> throw({error, {version_mismatch, DesiredVersion, DiscVersion}}) end; diff --git a/src/rabbit_upgrade.erl b/src/rabbit_upgrade.erl index d56b50b2..866f20ee 100644 --- a/src/rabbit_upgrade.erl +++ b/src/rabbit_upgrade.erl @@ -209,7 +209,7 @@ upgrade_mode(AllNodes) -> [mnesia]) of {badrpc, {'EXIT', {undef, _}}} -> ErrFun(unknown_old_version); {badrpc, Reason} -> ErrFun({unknown, Reason}); - CV -> case rabbit_version:'=~='( + CV -> case rabbit_version:matches( MyVersion, CV) of true -> secondary; false -> ErrFun(CV) diff --git a/src/rabbit_version.erl b/src/rabbit_version.erl index e079df4a..400abc10 100644 --- a/src/rabbit_version.erl +++ b/src/rabbit_version.erl @@ -16,7 +16,7 @@ -module(rabbit_version). --export([recorded/0, '=~='/2, desired/0, desired_for_scope/1, +-export([recorded/0, matches/2, desired/0, desired_for_scope/1, record_desired/0, record_desired_for_scope/1, upgrades_required/1]). @@ -32,7 +32,7 @@ -type(version() :: [atom()]). -spec(recorded/0 :: () -> rabbit_types:ok_or_error2(version(), any())). --spec('=~='/2 :: ([A], [A]) -> boolean()). +-spec(matches/2 :: ([A], [A]) -> boolean()). -spec(desired/0 :: () -> version()). -spec(desired_for_scope/1 :: (scope()) -> scope_version()). -spec(record_desired/0 :: () -> 'ok'). @@ -79,7 +79,7 @@ record_for_scope(Scope, ScopeVersion) -> %% ------------------------------------------------------------------- -'=~='(VerA, VerB) -> +matches(VerA, VerB) -> lists:usort(VerA) =:= lists:usort(VerB). %% ------------------------------------------------------------------- |