diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2011-01-12 13:05:53 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2011-01-12 13:05:53 +0000 |
| commit | 22af9498f8fed1b035b4b697940488fe3c60a4e6 (patch) | |
| tree | 5eb8a5228c0b3eb164c4e7075ba684e5b7cb77e8 /src | |
| parent | bc892dbf91c4df178c8319c375317bed343e5783 (diff) | |
| download | rabbitmq-server-git-22af9498f8fed1b035b4b697940488fe3c60a4e6.tar.gz | |
And fix again.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_upgrade.erl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/rabbit_upgrade.erl b/src/rabbit_upgrade.erl index a570df4a4e..4bf8d661da 100644 --- a/src/rabbit_upgrade.erl +++ b/src/rabbit_upgrade.erl @@ -159,7 +159,7 @@ maybe_upgrade(Scope) -> read_version() -> case rabbit_misc:read_term_file(schema_filename()) of - {ok, [V]} -> case is_orddict(V) of + {ok, [V]} -> case is_new_version(V) of false -> {ok, convert_old_version(V)}; true -> {ok, V} end; @@ -316,8 +316,8 @@ lock_filename(Dir) -> filename:join(Dir, ?LOCK_FILENAME). %% started yet info(Msg, Args) -> error_logger:info_msg(Msg, Args). -%% This doesn't check it's ordered but that's not needed for our purposes -is_orddict(Thing) -> - is_list(Thing) andalso +is_new_version(Version) -> + is_list(Version) andalso + length(Version) > 0 andalso lists:all(fun(Item) -> is_tuple(Item) andalso size(Item) == 2 end, - Thing). + Version). |