diff options
| author | Tristan Sloughter <t@crashfast.com> | 2018-02-26 15:31:42 -0800 |
|---|---|---|
| committer | Tristan Sloughter <t@crashfast.com> | 2018-02-26 15:58:58 -0800 |
| commit | 8229d15b6c8384e8d974b32d587b05d64fce185b (patch) | |
| tree | 96ac397e88968f1a01145aae5d5f827abc476c78 /src | |
| parent | 2560aaf5d05619d77a0c17e09106ac2b4ac1c6cc (diff) | |
rebar_package: do not return first package version for constraint with no match
Diffstat (limited to 'src')
| -rw-r--r-- | src/rebar_packages.erl | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/rebar_packages.erl b/src/rebar_packages.erl index d17b54f..7910fe2 100644 --- a/src/rebar_packages.erl +++ b/src/rebar_packages.erl @@ -170,8 +170,13 @@ 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)} + {ok, Vsns} -> + case handle_vsns(Constraint, Vsns) of + none -> + none; + FoundVsn -> + {ok, FoundVsn} + end catch error:badarg -> none @@ -189,16 +194,16 @@ find_all(Dep, Table, State) -> none end. -handle_vsns(Constraint, HeadVsn, VsnTail) -> +handle_vsns(Constraint, Vsns) -> lists:foldl(fun(Version, Highest) -> case ec_semver:pes(Version, Constraint) andalso - ec_semver:gt(Version, Highest) of + (Highest =:= none orelse ec_semver:gt(Version, Highest)) of true -> Version; false -> Highest end - end, HeadVsn, VsnTail). + end, none, Vsns). handle_single_vsn(Pkg, PkgVsn, Dep, Vsn, Constraint) -> case ec_semver:pes(Vsn, Constraint) of |