summaryrefslogtreecommitdiff
path: root/src/rebar_state.erl
diff options
context:
space:
mode:
Diffstat (limited to 'src/rebar_state.erl')
-rw-r--r--src/rebar_state.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rebar_state.erl b/src/rebar_state.erl
index 20ec4a0..2d9266a 100644
--- a/src/rebar_state.erl
+++ b/src/rebar_state.erl
@@ -54,7 +54,7 @@ new(ParentState=#state_t{}, Config) ->
-spec new(t(), list(), file:name()) -> t().
new(ParentState, Config, Dir) ->
- _Opts = ParentState#state_t.opts,
+ Opts = ParentState#state_t.opts,
LocalOpts = case rebar_config:consult_file(?LOCK_FILE) of
[D] ->
[{locks, D} | Config];
@@ -64,7 +64,7 @@ new(ParentState, Config, Dir) ->
ProviderModules = [],
create_logic_providers(ProviderModules, ParentState#state_t{dir=Dir
- ,opts=LocalOpts}).
+ ,opts=lists:umerge(LocalOpts, Opts)}).
get(State, Key) ->
proplists:get_value(Key, State#state_t.opts).