diff options
| -rw-r--r-- | priv/templates/install_upgrade_escript.dtl | 2 | ||||
| -rw-r--r-- | src/rlx_prv_assembler.erl | 2 | ||||
| -rw-r--r-- | src/rlx_prv_config.erl | 7 |
3 files changed, 8 insertions, 3 deletions
diff --git a/priv/templates/install_upgrade_escript.dtl b/priv/templates/install_upgrade_escript.dtl index 7c331aa..dce2e11 100644 --- a/priv/templates/install_upgrade_escript.dtl +++ b/priv/templates/install_upgrade_escript.dtl @@ -3,7 +3,7 @@ %% -*- mode: erlang;erlang-indent-level: 4;indent-tabs-mode: nil -*- %% ex: ft=erlang ts=4 sw=4 et --define(TIMEOUT, 60000). +-define(TIMEOUT, 300000). -define(INFO(Fmt,Args), io:format(Fmt,Args)). %% Upgrades, to a new tar.gz release diff --git a/src/rlx_prv_assembler.erl b/src/rlx_prv_assembler.erl index 069344e..47d96aa 100644 --- a/src/rlx_prv_assembler.erl +++ b/src/rlx_prv_assembler.erl @@ -700,7 +700,7 @@ ensure_not_exist(RelConfPath) -> erl_script(ErtsVsn) -> render(erl_script_dtl, [{erts_vsn, ErtsVsn}]). - + bin_file_contents(OsFamily, RelName, RelVsn, ErtsVsn, ErlOpts) -> Template = case OsFamily of unix -> bin_dtl; diff --git a/src/rlx_prv_config.erl b/src/rlx_prv_config.erl index da620be..7c2ace0 100644 --- a/src/rlx_prv_config.erl +++ b/src/rlx_prv_config.erl @@ -122,7 +122,12 @@ load_config(ConfigFile, State) -> -spec load_terms(term(), {ok, rlx_state:t()} | relx:error()) -> {ok, rlx_state:t()} | relx:error(). load_terms({default_release, RelName, RelVsn}, {ok, State}) -> - {ok, rlx_state:default_configured_release(State, RelName, RelVsn)}; + case rlx_state:default_configured_release(State) of + {undefined, undefined} -> + {ok, rlx_state:default_configured_release(State, RelName, RelVsn)}; + _ -> + {ok, State} + end; load_terms({paths, Paths}, {ok, State}) -> code:add_pathsa([filename:absname(Path) || Path <- Paths]), {ok, State}; |