diff options
| author | Fred Hebert <mononcqc@ferd.ca> | 2019-05-06 14:49:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-06 14:49:35 -0400 |
| commit | 4b610f56e6a8d23aee66a925222abed0f206a6e9 (patch) | |
| tree | 9cb2ec9fd42d3f5f99bce73c8d75a7a8312d3788 /src/rebar_prv_install_deps.erl | |
| parent | ec224b7921cda1f9a1ef4373e80e706c173bf75f (diff) | |
| parent | 199705762c9fa0e0ff9cf494df731fe8fc9f4406 (diff) | |
Merge pull request #2032 from fenollp/p-hex
format hex packages in a nice/human way
Diffstat (limited to 'src/rebar_prv_install_deps.erl')
| -rw-r--r-- | src/rebar_prv_install_deps.erl | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/rebar_prv_install_deps.erl b/src/rebar_prv_install_deps.erl index 0187b4f..4bd5805 100644 --- a/src/rebar_prv_install_deps.erl +++ b/src/rebar_prv_install_deps.erl @@ -283,7 +283,7 @@ update_seen_dep(AppInfo, _Profile, _Level, Deps, Apps, State, Upgrade, Seen, Loc %% meaning there is no conflict, so don't warn about it. skip; _ -> - warn_skip_deps(Name, Source, State) + warn_skip_deps(AppInfo, State) end; true -> ok @@ -395,8 +395,7 @@ make_relative_to_root(State, Path) when is_list(Path) -> rebar_dir:make_relative_path(Path, Root). fetch_app(AppInfo, State) -> - ?INFO("Fetching ~ts (~p)", [rebar_app_info:name(AppInfo), - rebar_resource_v2:format_source(rebar_app_info:source(AppInfo))]), + ?INFO("Fetching ~ts", [rebar_resource_v2:format_source(AppInfo)]), rebar_fetch:download_source(AppInfo, State). maybe_upgrade(AppInfo, _AppDir, Upgrade, State) -> @@ -404,8 +403,7 @@ maybe_upgrade(AppInfo, _AppDir, Upgrade, State) -> true -> case rebar_fetch:needs_update(AppInfo, State) of true -> - ?INFO("Upgrading ~ts (~p)", [rebar_app_info:name(AppInfo), - rebar_resource_v2:format_source(rebar_app_info:source(AppInfo))]), + ?INFO("Upgrading ~ts", [rebar_resource_v2:format_source(AppInfo)]), rebar_fetch:download_source(AppInfo, State); false -> case Upgrade of @@ -420,11 +418,10 @@ maybe_upgrade(AppInfo, _AppDir, Upgrade, State) -> AppInfo end. -warn_skip_deps(Name, Source, State) -> - Msg = "Skipping ~ts (from ~p) as an app of the same name " +warn_skip_deps(AppInfo, State) -> + Msg = "Skipping ~ts as an app of the same name " "has already been fetched", - Args = [Name, - rebar_resource_v2:format_source(Source)], + Args = [rebar_resource_v2:format_source(AppInfo)], case rebar_state:get(State, deps_error_on_conflict, false) of false -> case rebar_state:get(State, deps_warning_on_conflict, true) of |