Merge pull request #2221 from ferd/mute-supported-lock-warnings

Eliminate lock file warnings when upgrading from 1.1.0 locks

src/rebar.hrl

@@ -23,6 +23,7 @@
 -define(DEFAULT_TEST_DEPS_DIR, "test/lib").
 -define(DEFAULT_RELEASE_DIR, "rel").
 -define(CONFIG_VERSION, "1.2.0").
+-define(SUPPORTED_CONFIG_VERSIONS, ["1.1.0", "1.2.0"]). % older were untagged
 -define(DEFAULT_CDN, "https://repo.hex.pm/").
 -define(REMOTE_PACKAGE_DIR, "tarballs").
 -define(LOCK_FILE, "rebar.lock").

src/rebar_config.erl

@@ -69,7 +69,7 @@ consult_lock_file(File) ->
     case Terms of
         [] ->
             [];
-        [Locks] when is_list(Locks) -> % beta lock file
+        [Locks] when is_list(Locks) -> % beta/1.0.0 lock file
             read_attrs(beta, Locks, []);
         [{Vsn, Locks}|Attrs] when is_list(Locks) -> % versioned lock file
             %% Because this is the first version of rebar3 to introduce a lock
@@ -79,10 +79,16 @@ consult_lock_file(File) ->
                 ?CONFIG_VERSION ->
                     ok;
                 _ ->
-                    %% Make sure the warning below is to be shown whenever a version
-                    %% newer than the current one is being used, as we can't parse
-                    %% all the contents of the lock file properly.
-                    warn_vsn_once()
+                    case lists:member(Vsn, ?SUPPORTED_CONFIG_VERSIONS) of
+                        true ->
+                            ok;
+                        false ->
+                            %% Make sure the warning below is to be shown
+                            %% whenever a version newer than the current
+                            %% one is being used, as we can't parse all the
+                            %% contents of the lock file properly.
+                            warn_vsn_once()
+                    end
             end,
             read_attrs(Vsn, Locks, Attrs)
     end.