1 files changed, 61 insertions, 18 deletions

diff --git a/src/rebar_packages.erl b/src/rebar_packages.erl
index c56009e..d4b8a14 100644
--- a/src/rebar_packages.erl
+++ b/src/rebar_packages.erl
@@ -7,7 +7,9 @@
         ,registry_dir/1
         ,package_dir/1
         ,registry_checksum/2
+        ,find_highest_matching/6
         ,find_highest_matching/4
+        ,find_all/3
         ,verify_table/1
         ,format_error/1]).
 
@@ -65,22 +67,28 @@ deps(Name, Vsn, State) ->
         deps_(Name, Vsn, State)
     catch
         _:_ ->
-            handle_missing_package(Name, Vsn, State)
+            handle_missing_package({Name, Vsn}, State, fun(State1) -> deps_(Name, Vsn, State1) end)
     end.
 
 deps_(Name, Vsn, State) ->
     ?MODULE:verify_table(State),
     ets:lookup_element(?PACKAGE_TABLE, {ec_cnv:to_binary(Name), ec_cnv:to_binary(Vsn)}, 2).
 
-handle_missing_package(Name, Vsn, State) ->
-    ?INFO("Package ~s-~s not found. Fetching registry updates and trying again...", [Name, Vsn]),
+handle_missing_package(Dep, State, Fun) ->
+    case Dep of
+        {Name, Vsn} ->
+            ?INFO("Package ~s-~s not found. Fetching registry updates and trying again...", [Name, Vsn]);
+        _ ->
+            ?INFO("Package ~p not found. Fetching registry updates and trying again...", [Dep])
+    end,
+
     {ok, State1} = rebar_prv_update:do(State),
     try
-        deps_(Name, Vsn, State1)
+        Fun(State1)
     catch
         _:_ ->
             %% Even after an update the package is still missing, time to error out
-            throw(?PRV_ERROR({missing_package, ec_cnv:to_binary(Name), ec_cnv:to_binary(Vsn)}))
+            throw(?PRV_ERROR({missing_package, Dep}))
     end.
 
 registry_dir(State) ->
@@ -139,16 +147,43 @@ registry_checksum({pkg, Name, Vsn}, State) ->
 %% `~> 2.0` | `>= 2.0.0 and < 3.0.0`
 %% `~> 2.1` | `>= 2.1.0 and < 3.0.0`
 find_highest_matching(Dep, Constraint, Table, State) ->
+    find_highest_matching(undefined, undefined, Dep, Constraint, Table, State).
+
+find_highest_matching(Pkg, PkgVsn, Dep, Constraint, Table, State) ->
+    try find_highest_matching_(Pkg, PkgVsn, Dep, Constraint, Table, State) of
+        none ->
+            handle_missing_package(Dep, State,
+                                   fun(State1) ->
+                                       find_highest_matching_(Pkg, PkgVsn, Dep, Constraint, Table, State1)
+                                   end);
+        Result ->
+            Result
+    catch
+        _:_ ->
+            handle_missing_package(Dep, State,
+                                   fun(State1) ->
+                                       find_highest_matching_(Pkg, PkgVsn, Dep, Constraint, Table, State1)
+                                   end)
+    end.
+
+find_highest_matching_(Pkg, PkgVsn, Dep, Constraint, Table, State) ->
+    try find_all(Dep, Table, State) of
+        {ok, [Vsn]} ->
+            handle_single_vsn(Pkg, PkgVsn, Dep, Vsn, Constraint);
+        {ok, [HeadVsn | VsnTail]} ->
+                            {ok, handle_vsns(Constraint, HeadVsn, VsnTail)}
+    catch
+        error:badarg ->
+            none
+    end.
+
+find_all(Dep, Table, State) ->
     ?MODULE:verify_table(State),
     try ets:lookup_element(Table, Dep, 2) of
-        [[HeadVsn | VsnTail]] ->
-            {ok, handle_vsns(Constraint, HeadVsn, VsnTail)};
-        [[Vsn]] ->
-            handle_single_vsn(Dep, Vsn, Constraint);
-        [Vsn] ->
-            handle_single_vsn(Dep, Vsn, Constraint);
-        [HeadVsn | VsnTail] ->
-            {ok, handle_vsns(Constraint, HeadVsn, VsnTail)}
+        [Vsns] when is_list(Vsns)->
+            {ok, Vsns};
+        Vsns ->
+            {ok, Vsns}
     catch
         error:badarg ->
             none
@@ -165,18 +200,26 @@ handle_vsns(Constraint, HeadVsn, VsnTail) ->
                         end
                 end, HeadVsn, VsnTail).
 
-handle_single_vsn(Dep, Vsn, Constraint) ->
+handle_single_vsn(Pkg, PkgVsn, Dep, Vsn, Constraint) ->
     case ec_semver:pes(Vsn, Constraint) of
         true ->
             {ok, Vsn};
         false ->
-            ?WARN("Only existing version of ~s is ~s which does not match constraint ~~> ~s. "
-                 "Using anyway, but it is not guaranteed to work.", [Dep, Vsn, Constraint]),
+            case {Pkg, PkgVsn} of
+                {undefined, undefined} ->
+                    ?WARN("Only existing version of ~s is ~s which does not match constraint ~~> ~s. "
+                          "Using anyway, but it is not guaranteed to work.", [Dep, Vsn, Constraint]);
+                _ ->
+                    ?WARN("[~s:~s] Only existing version of ~s is ~s which does not match constraint ~~> ~s. "
+                          "Using anyway, but it is not guaranteed to work.", [Pkg, PkgVsn, Dep, Vsn, Constraint])
+            end,
             {ok, Vsn}
     end.
 
-format_error({missing_package, Package, Version}) ->
-    io_lib:format("Package not found in registry: ~s-~s.", [Package, Version]).
+format_error({missing_package, {Name, Vsn}}) ->
+    io_lib:format("Package not found in registry: ~s-~s.", [ec_cnv:to_binary(Name), ec_cnv:to_binary(Vsn)]);
+format_error({missing_package, Dep}) ->
+    io_lib:format("Package not found in registry: ~p.", [Dep]).
 
 verify_table(State) ->
     ets:info(?PACKAGE_TABLE, named_table) =:= true orelse load_and_verify_version(State).