aboutsummaryrefslogtreecommitdiffstats
path: root/src/rlx_prv_release.erl
diff options
context:
space:
mode:
authorJordan Wilberding <[email protected]>2015-11-21 11:45:19 -0800
committerJordan Wilberding <[email protected]>2015-11-21 11:45:19 -0800
commitc81e404b40c3f2427a60a3f4c9192081839e3398 (patch)
tree9a2c7260def1d0553da988b06447c9447b4b4fa6 /src/rlx_prv_release.erl
parent32b1831e15d6a02e9e233df48e5948b0c7228fbd (diff)
parent671018774204bfb63d114a6829928fde991e9ead (diff)
downloadrelx-c81e404b40c3f2427a60a3f4c9192081839e3398.tar.gz
relx-c81e404b40c3f2427a60a3f4c9192081839e3398.tar.bz2
relx-c81e404b40c3f2427a60a3f4c9192081839e3398.zip
Merge pull request #414 from tsloughter/per_rel_config_overrides
support overriding config values with per-release config values
Diffstat (limited to 'src/rlx_prv_release.erl')
-rw-r--r--src/rlx_prv_release.erl6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/rlx_prv_release.erl b/src/rlx_prv_release.erl
index f83cce3..5feb798 100644
--- a/src/rlx_prv_release.erl
+++ b/src/rlx_prv_release.erl
@@ -164,6 +164,10 @@ solve_release(State0, DepGraph, RelName, RelVsn) ->
{ok, Release0} ->
rlx_release:relfile(rlx_state:get_configured_release(State0, RelName, RelVsn), rlx_release:relfile(Release0))
end,
+
+ %% get per release config values and override the State with them
+ Config = rlx_release:config(Release),
+ {ok, State1} = lists:foldl(fun rlx_config:load_terms/2, {ok, State0}, Config),
Goals = rlx_release:goals(Release),
case Goals of
[] ->
@@ -171,7 +175,7 @@ solve_release(State0, DepGraph, RelName, RelVsn) ->
_ ->
case rlx_depsolver:solve(DepGraph, Goals) of
{ok, Pkgs} ->
- set_resolved(State0, Release, Pkgs);
+ set_resolved(State1, Release, Pkgs);
{error, Error} ->
?RLX_ERROR({failed_solve, Error})
end