diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2011-03-17 16:53:15 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2011-03-17 16:53:15 +0000 |
| commit | 4ce9edcdab9ecef06a552754bb453c4a841ceb8b (patch) | |
| tree | 15f877d88b001007a17a5a09b7f577dc9bb738e3 | |
| parent | eeda0bc1acd1be613c636a041b76dcce0b9b938a (diff) | |
| download | rabbitmq-server-git-4ce9edcdab9ecef06a552754bb453c4a841ceb8b.tar.gz | |
Can't call =~= with non-version args, thus shuffle things around a bit. End up saving a line.
| -rw-r--r-- | src/rabbit_upgrade.erl | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/src/rabbit_upgrade.erl b/src/rabbit_upgrade.erl index 20f53da236..875d971aeb 100644 --- a/src/rabbit_upgrade.erl +++ b/src/rabbit_upgrade.erl @@ -139,24 +139,23 @@ upgrade_mode(AllNodes) -> []) end; [Another|_] -> - ClusterVersion = - case rpc:call(Another, rabbit_version, desired_for_scope, - [mnesia]) of - {badrpc, {'EXIT', {undef, _}}} -> unknown_old_version; - {badrpc, Reason} -> {unknown, Reason}; - V -> V - end, MyVersion = rabbit_version:desired_for_scope(mnesia), - case rabbit_version:'=~='(ClusterVersion, MyVersion) of - true -> - %% The other node(s) have upgraded already, I am not the - %% upgrader - secondary; - false -> - %% The other node(s) are running an unexpected version. - die("Cluster upgrade needed but other nodes are " - "running ~p~nand I want ~p", - [ClusterVersion, MyVersion]) + ErrFun = fun (ClusterVersion) -> + %% The other node(s) are running an + %% unexpected version. + die("Cluster upgrade needed but other nodes are " + "running ~p~nand I want ~p", + [ClusterVersion, MyVersion]) + end, + case rpc:call(Another, rabbit_version, desired_for_scope, + [mnesia]) of + {badrpc, {'EXIT', {undef, _}}} -> ErrFun(unknown_old_version); + {badrpc, Reason} -> ErrFun({unknown, Reason}); + CV -> case rabbit_version:'=~='( + MyVersion, CV) of + true -> secondary; + false -> ErrFun(CV) + end end end. |