diff options
| author | Tristan Sloughter <[email protected]> | 2014-05-04 11:43:09 -0500 |
|---|---|---|
| committer | Tristan Sloughter <[email protected]> | 2014-05-04 11:43:09 -0500 |
| commit | 5a5ca5bae78760f49e089a110171d9cbcaae6784 (patch) | |
| tree | b54daea46eee5ebd37230160856b12899dee92fe | |
| parent | a52e556a15b805561f42689b7de0e14097b2bff4 (diff) | |
| parent | eaaba77151548423adf1badde0f83177b2355d44 (diff) | |
| download | relx-5a5ca5bae78760f49e089a110171d9cbcaae6784.tar.gz relx-5a5ca5bae78760f49e089a110171d9cbcaae6784.tar.bz2 relx-5a5ca5bae78760f49e089a110171d9cbcaae6784.zip | |
Merge pull request #157 from jwilberding/timeout
Timeout
| -rw-r--r-- | priv/templates/install_upgrade_escript.dtl | 2 | ||||
| -rw-r--r-- | src/rlx_prv_assembler.erl | 2 |
2 files changed, 2 insertions, 2 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; |