Merge pull request #157 from jwilberding/timeout

Timeout
erlware · May 4, 2014 · 5a5ca5b · 5a5ca5b
2 parents a52e556 + eaaba77
commit 5a5ca5b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;