diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/rebar_hex_repos.erl | 5 | ||||
| -rw-r--r-- | src/rebar_hg_resource.erl | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/rebar_hex_repos.erl b/src/rebar_hex_repos.erl index 57b5bc8..def5f49 100644 --- a/src/rebar_hex_repos.erl +++ b/src/rebar_hex_repos.erl @@ -68,17 +68,20 @@ repos(HexConfig) -> merge_repos(RepoList ++ [HexDefaultConfig]) end. +%% merge repos must add a field repo_name to work with hex_core 0.4.0 -spec merge_repos([repo()]) -> [repo()]. merge_repos(Repos) -> lists:foldl(fun(R=#{name := Name}, ReposAcc) -> %% private organizations include the parent repo before a : case rebar_string:split(Name, <<":">>) of [Repo, Org] -> + %% hex_core uses repo_name for parent update_repo_list(R#{name => Name, + repo_name => Repo, organization => Org, parent => Repo}, ReposAcc); _ -> - update_repo_list(R, ReposAcc) + update_repo_list(R#{repo_name => Name}, ReposAcc) end end, [], Repos). diff --git a/src/rebar_hg_resource.erl b/src/rebar_hg_resource.erl index 763803c..5ae1ee0 100644 --- a/src/rebar_hg_resource.erl +++ b/src/rebar_hg_resource.erl @@ -200,7 +200,7 @@ check_type_support() -> case get({is_supported, ?MODULE}) of true -> ok; - false -> + _ -> case rebar_utils:sh("hg --version", [{return_on_error, true}, {use_stdout, false}]) of {error, _} -> @@ -210,4 +210,3 @@ check_type_support() -> ok end end. - |