diff options
| author | Siri Hansen <[email protected]> | 2012-03-23 10:43:50 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2012-03-23 10:49:40 +0100 |
| commit | fd89175a2b17e92a0b90cb28e5af2375d3aa4535 (patch) | |
| tree | 135c420e171a652240183799c51cc2ea6220142c /lib/sasl/src/systools.hrl | |
| parent | 95b0ebeede7ac325288ab5f7e98e95ab2b860b3a (diff) | |
| parent | 5e575f65629f6d99ed423bc646219c162f6bfa1a (diff) | |
| download | otp-fd89175a2b17e92a0b90cb28e5af2375d3aa4535.tar.gz otp-fd89175a2b17e92a0b90cb28e5af2375d3aa4535.tar.bz2 otp-fd89175a2b17e92a0b90cb28e5af2375d3aa4535.zip | |
Merge branch 'jc/omit-undefined-start_phases-3' into maint
* jc/omit-undefined-start_phases-3:
Avoid undefined start_phases entry in .script
Avoid creating an undefined start_phases entry when generating a release
OTP-10003
Diffstat (limited to 'lib/sasl/src/systools.hrl')
| -rw-r--r-- | lib/sasl/src/systools.hrl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/sasl/src/systools.hrl b/lib/sasl/src/systools.hrl index 9a3e98221c..da531dbee5 100644 --- a/lib/sasl/src/systools.hrl +++ b/lib/sasl/src/systools.hrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2009. All Rights Reserved. +%% Copyright Ericsson AB 1996-2012. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -60,7 +60,8 @@ %% integer() | infinity. mod = [], %% [] | {Mod, StartArgs}, Mod= atom(), %% StartArgs = list(). - start_phases = [], %% [] | {Phase, PhaseArgs}, Phase = atom(), + start_phases, %% [{Phase, PhaseArgs}] | undefined, + %% Phase = atom(), %% PhaseArgs = list(). dir = "" %% The directory where the .app file was %% found (internal use). |