aboutsummaryrefslogtreecommitdiffstats
path: root/lib/reltool/src
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2012-03-23 10:43:50 +0100
committerSiri Hansen <[email protected]>2012-03-23 10:49:40 +0100
commitfd89175a2b17e92a0b90cb28e5af2375d3aa4535 (patch)
tree135c420e171a652240183799c51cc2ea6220142c /lib/reltool/src
parent95b0ebeede7ac325288ab5f7e98e95ab2b860b3a (diff)
parent5e575f65629f6d99ed423bc646219c162f6bfa1a (diff)
downloadotp-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/reltool/src')
-rw-r--r--lib/reltool/src/reltool_target.erl16
1 files changed, 10 insertions, 6 deletions
diff --git a/lib/reltool/src/reltool_target.erl b/lib/reltool/src/reltool_target.erl
index 3d83a77d99..44f1977ad6 100644
--- a/lib/reltool/src/reltool_target.erl
+++ b/lib/reltool/src/reltool_target.erl
@@ -247,10 +247,15 @@ gen_app(#app{name = Name,
env = Env,
mod = StartMod,
start_phases = StartPhases}}) ->
- StartMod2 =
- case StartMod =:= undefined of
- true -> [];
- false -> [{mod, StartMod}]
+ StartPhases2 =
+ case StartPhases of
+ undefined -> [];
+ _ -> [{start_phases, StartPhases}]
+ end,
+ Tail =
+ case StartMod of
+ undefined -> StartPhases2;
+ _ -> [{mod, StartMod} | StartPhases2]
end,
{application, Name,
[{description, Desc},
@@ -261,10 +266,9 @@ gen_app(#app{name = Name,
{applications, ReqApps},
{included_applications, InclApps},
{env, Env},
- {start_phases, StartPhases},
{maxT, MaxT},
{maxP, MaxP} |
- StartMod2]}.
+ Tail]}.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Generate the contents of a rel file