aboutsummaryrefslogtreecommitdiffstats
path: root/src/rlx_prv_relup.erl
diff options
context:
space:
mode:
authorJordan Wilberding <[email protected]>2014-11-03 13:02:18 -0800
committerJordan Wilberding <[email protected]>2014-11-03 13:02:18 -0800
commit9d550533bb1440e93f4a014cb6303f427a51f2dc (patch)
tree346016bc34896d7919806ee2e3fa05564c4283a1 /src/rlx_prv_relup.erl
parent5368a5cd945aa3dd0723258cdad051aa8f7b4920 (diff)
parent04ea67a7eded3cc296e27ce1a9ae766a638035df (diff)
downloadrelx-9d550533bb1440e93f4a014cb6303f427a51f2dc.tar.gz
relx-9d550533bb1440e93f4a014cb6303f427a51f2dc.tar.bz2
relx-9d550533bb1440e93f4a014cb6303f427a51f2dc.zip
Merge pull request #236 from tsloughter/format_error2
Some changes for providers as I work on rebar3
Diffstat (limited to 'src/rlx_prv_relup.erl')
-rw-r--r--src/rlx_prv_relup.erl16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/rlx_prv_relup.erl b/src/rlx_prv_relup.erl
index bc86304..df6f831 100644
--- a/src/rlx_prv_relup.erl
+++ b/src/rlx_prv_relup.erl
@@ -26,7 +26,7 @@
-export([init/1,
do/1,
- format_error/1]).
+ format_error/2]).
-include("relx.hrl").
@@ -55,24 +55,24 @@ do(State) ->
Release0 = rlx_state:get_realized_release(State, RelName, RelVsn),
make_relup(State, Release0).
-format_error({relup_generation_error, CurrentName, UpFromName}) ->
+format_error({relup_generation_error, CurrentName, UpFromName}, _) ->
io_lib:format("Unknown internal release error generating the relup from ~s to ~s",
[UpFromName, CurrentName]);
-format_error({relup_generation_warning, Module, Warnings}) ->
+format_error({relup_generation_warning, Module, Warnings}, _) ->
["Warnings generating relup \s",
rlx_util:indent(2), Module:format_warning(Warnings)];
-format_error({no_upfrom_release_found, undefined}) ->
+format_error({no_upfrom_release_found, undefined}, _) ->
io_lib:format("No earlier release for relup found", []);
-format_error({no_upfrom_release_found, Vsn}) ->
+format_error({no_upfrom_release_found, Vsn}, _) ->
io_lib:format("Upfrom release version (~s) for relup not found", [Vsn]);
format_error({relup_script_generation_error,
{relup_script_generation_error, systools_relup,
- {missing_sasl, _}}}) ->
+ {missing_sasl, _}}}, _) ->
"Unfortunately, due to requirements in systools, you need to have the sasl application "
"in both the current release and the release to upgrade from.";
-format_error({relup_script_generation_error, Module, Errors}) ->
+format_error({relup_script_generation_error, Module, Errors}, State) ->
["Errors generating relup \n",
- rlx_util:indent(2), Module:format_error(Errors)].
+ rlx_util:indent(2), Module:format_error(Errors, State)].
make_relup(State, Release) ->
Vsn = rlx_state:upfrom(State),