Change the new version format from:

[{local,  [...]},
 {mnesia, [...]}].

to:

[{rabbit, [{local,  [...]},
           {mnesia, [...]}]}].

This is to allow for future work allowing plugins to own upgrades (that
can be ignored if the plugin is uninstalled), without having to change
the format *again*.

1 files changed, 5 insertions, 3 deletions

diff --git a/src/rabbit_upgrade.erl b/src/rabbit_upgrade.erl
index b222845d47..f279029ae2 100644
--- a/src/rabbit_upgrade.erl
+++ b/src/rabbit_upgrade.erl
@@ -163,7 +163,8 @@ read_version() ->
     case rabbit_misc:read_term_file(schema_filename()) of
         {ok, [V]}        -> case is_new_version(V) of
                                 false -> {ok, convert_old_version(V)};
-                                true  -> {ok, V}
+                                true  -> [{rabbit, RV}] = V,
+                                         {ok, RV}
                             end;
         {error, _} = Err -> Err
     end.
@@ -175,13 +176,14 @@ read_version(Scope) ->
     end.
 
 write_version() ->
-    ok = rabbit_misc:write_term_file(schema_filename(), [desired_version()]),
+    ok = rabbit_misc:write_term_file(schema_filename(),
+                                     [[{rabbit, desired_version()}]]),
     ok.
 
 write_version(Scope) ->
     {ok, V0} = read_version(),
     V = orddict:store(Scope, desired_version(Scope), V0),
-    ok = rabbit_misc:write_term_file(schema_filename(), [V]),
+    ok = rabbit_misc:write_term_file(schema_filename(), [[{rabbit, V}]]),
     ok.
 
 desired_version() ->