aboutsummaryrefslogtreecommitdiffstats
path: root/src/rcl_prv_config.erl
diff options
context:
space:
mode:
authorEric B Merritt <[email protected]>2013-05-09 16:43:56 -0700
committerEric <[email protected]>2013-05-09 16:43:56 -0700
commite68bbac546e084b4949dc01cbe88c03f6c667139 (patch)
tree9ed549be44458efcff5231710d931179db12af45 /src/rcl_prv_config.erl
parentc2c4e59ab1f234e13617b01d612f6bbcef9fd6c7 (diff)
downloadrelx-e68bbac546e084b4949dc01cbe88c03f6c667139.tar.gz
relx-e68bbac546e084b4949dc01cbe88c03f6c667139.tar.bz2
relx-e68bbac546e084b4949dc01cbe88c03f6c667139.zip
support a hard distinction between configured releases and realized releases
Diffstat (limited to 'src/rcl_prv_config.erl')
-rw-r--r--src/rcl_prv_config.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rcl_prv_config.erl b/src/rcl_prv_config.erl
index dfbc321..2bc9851 100644
--- a/src/rcl_prv_config.erl
+++ b/src/rcl_prv_config.erl
@@ -123,7 +123,7 @@ load_config(ConfigFile, State) ->
-spec load_terms(term(), {ok, rcl_state:t()} | relcool:error()) ->
{ok, rcl_state:t()} | relcool:error().
load_terms({default_release, RelName, RelVsn}, {ok, State}) ->
- {ok, rcl_state:default_release(State, RelName, RelVsn)};
+ {ok, rcl_state:default_configured_release(State, RelName, RelVsn)};
load_terms({paths, Paths}, {ok, State}) ->
code:add_pathsa([filename:absname(Path) || Path <- Paths]),
{ok, State};
@@ -154,7 +154,7 @@ load_terms({release, {RelName, Vsn}, Applications}, {ok, State0}) ->
E={error, _} ->
E;
{ok, Release1} ->
- {ok, rcl_state:add_release(State0, Release1)}
+ {ok, rcl_state:add_configured_release(State0, Release1)}
end;
load_terms({release, {RelName, Vsn}, {erts, ErtsVsn},
Applications}, {ok, State}) ->
@@ -163,7 +163,7 @@ load_terms({release, {RelName, Vsn}, {erts, ErtsVsn},
E={error, _} ->
E;
{ok, Release1} ->
- {ok, rcl_state:add_release(State, Release1)}
+ {ok, rcl_state:add_configured_release(State, Release1)}
end;
load_terms({sys_config, SysConfig}, {ok, State}) ->
{ok, rcl_state:sys_config(State, filename:absname(SysConfig))};