From 59ace4da2dbc317a922f3ef0022ccc0455b882da Mon Sep 17 00:00:00 2001
From: Luis Rascao <luis.rascao@gmail.com>
Date: Wed, 4 Jan 2017 19:22:32 +0000
Subject: Don't crash on warnings emitted during relup

Make use of warnings_on_errors option to exit
with error or proceed with just a warning.
---
 src/rlx_prv_relup.erl | 37 ++++++++++++++++++++++++++++++++++---
 1 file changed, 34 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/rlx_prv_relup.erl b/src/rlx_prv_relup.erl
index 9ac2135..1f8a950 100644
--- a/src/rlx_prv_relup.erl
+++ b/src/rlx_prv_relup.erl
@@ -65,6 +65,15 @@ format_error({relup_script_generation_error,
                {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_warn, systools_relup,
+               [{erts_vsn_changed, _},
+                {erts_vsn_changed, _}]}) ->
+    "It has been detected that the ERTS version changed while generating the relup between versions, "
+    "please be aware that an instruction that will automatically restart the VM will be inserted in "
+    "this case";
+format_error({relup_script_generation_warn, Module, Warnings}) ->
+    ["Warnings generating relup \n",
+     rlx_util:indent(2), Module:format_warning(Warnings)];
 format_error({relup_script_generation_error, Module, Errors}) ->
     ["Errors generating relup \n",
      rlx_util:indent(2), Module:format_error(Errors)].
@@ -119,10 +128,20 @@ get_up_release(State, Release, Vsn) ->
 
 make_upfrom_script(State, Release, UpFrom) ->
     OutputDir = rlx_state:output_dir(State),
+    WarningsAsErrors = rlx_state:warnings_as_errors(State),
     Options = [{outdir, OutputDir},
                {path, rlx_util:get_code_paths(Release, OutputDir) ++
                    rlx_util:get_code_paths(UpFrom, OutputDir)},
                silent],
+               %% the following block can be uncommented
+               %% when systools:make_relup/4 returns
+               %% {error,Module,Errors} instead of error
+               %% when taking the warnings_as_errors option
+               %% ++
+               %% case WarningsAsErrors of
+               %%     true -> [warnings_as_errors];
+               %%     false -> []
+              % end,
     CurrentRel = strip_rel(rlx_release:relfile(Release)),
     UpFromRel = strip_rel(rlx_release:relfile(UpFrom)),
     ec_cmd_log:debug(rlx_state:log(State),
@@ -138,14 +157,26 @@ make_upfrom_script(State, Release, UpFrom) ->
                           [UpFromRel, CurrentRel]),
             {ok, State};
         error ->
-            ?RLX_ERROR({relup_script_generation_error, CurrentRel, UpFromRel});
+            ?RLX_ERROR({relup_generation_error, CurrentRel, UpFromRel});
         {ok, RelUp, _, []} ->
             write_relup_file(State, Release, RelUp),
             ec_cmd_log:info(rlx_state:log(State),
                             "relup successfully created!"),
             {ok, State};
-        {ok,_, Module,Warnings} ->
-            ?RLX_ERROR({relup_script_generation_warn, Module, Warnings});
+        {ok, RelUp, Module,Warnings} ->
+            case WarningsAsErrors of
+                true ->
+                    %% since we don't pass the warnings_as_errors option
+                    %% the relup file gets generated anyway, we need to delete
+                    %% it
+                    file:delete(filename:join([OutputDir, "relup"])),
+                    ?RLX_ERROR({relup_script_generation_warn, Module, Warnings});
+                false ->
+                    write_relup_file(State, Release, RelUp),
+                    ec_cmd_log:warn(rlx_state:log(State),
+                            format_error({relup_script_generation_warn, Module, Warnings})),
+                    {ok, State}
+            end;
         {error,Module,Errors} ->
             ?RLX_ERROR({relup_script_generation_error, Module, Errors})
     end.
-- 
cgit v1.2.3