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_make.erl | |
| 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_make.erl')
| -rw-r--r-- | lib/sasl/src/systools_make.erl | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/lib/sasl/src/systools_make.erl b/lib/sasl/src/systools_make.erl index d8adfeb98f..61e660e918 100644 --- a/lib/sasl/src/systools_make.erl +++ b/lib/sasl/src/systools_make.erl @@ -1468,15 +1468,18 @@ pack_app(#application{name=Name,vsn=V,id=Id,description=D,modules=M, {applications, App}, {included_applications, Incs}, {env, Env}, - {start_phases, SF}, {maxT, MaxT}, {maxP, MaxP} | - behave(Mod)]}. - + behave([{start_phases,SF},{mod,Mod}])]}. + +behave([{mod,[]}|T]) -> + behave(T); +behave([{start_phases,undefined}|T]) -> + behave(T); +behave([H|T]) -> + [H|behave(T)]; behave([]) -> - []; -behave(Mod) -> - [{mod, Mod}]. + []. %%______________________________________________________________________ %% mandatory modules; this modules must be loaded before processes |