diff options
| author | Fred Hebert <mononcqc@ferd.ca> | 2015-08-01 15:15:34 -0400 |
|---|---|---|
| committer | Fred Hebert <mononcqc@ferd.ca> | 2015-08-01 15:15:34 -0400 |
| commit | 0d9128fe7ca0611d756f8e587bf36dba8532ebba (patch) | |
| tree | b9d4377e5b59d272c4171de891d006bbdd9c3537 /src | |
| parent | bf6d4e5a19be4e5821bf44a10fbfbf5a595fa59d (diff) | |
| parent | 8b24b497399ab02a94ecfb65da3428e2b9f82417 (diff) | |
Merge pull request #669 from tsloughter/upgrade_default_deps
only use upgrade on default deps
Diffstat (limited to 'src')
| -rw-r--r-- | src/rebar_prv_upgrade.erl | 2 | ||||
| -rw-r--r-- | src/rebar_state.erl | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/rebar_prv_upgrade.erl b/src/rebar_prv_upgrade.erl index 46aed9e..a50e64f 100644 --- a/src/rebar_prv_upgrade.erl +++ b/src/rebar_prv_upgrade.erl @@ -45,7 +45,7 @@ init(State) -> do(State) -> {Args, _} = rebar_state:command_parsed_args(State), Locks = rebar_state:get(State, {locks, default}, []), - Deps = rebar_state:get(State, deps), + Deps = rebar_state:get(State, deps, []), Names = parse_names(ec_cnv:to_binary(proplists:get_value(package, Args, <<"">>)), Locks), case prepare_locks(Names, Deps, Locks, []) of {error, Reason} -> diff --git a/src/rebar_state.erl b/src/rebar_state.erl index 1e0abc5..8c43496 100644 --- a/src/rebar_state.erl +++ b/src/rebar_state.erl @@ -344,8 +344,8 @@ merge_opts(Profile, NewOpts, OldOpts) -> end. merge_opts(NewOpts, OldOpts) -> - dict:merge(fun(deps, NewValue, _OldValue) -> - NewValue; + dict:merge(fun(deps, _NewValue, OldValue) -> + OldValue; ({deps, _}, NewValue, _OldValue) -> NewValue; (plugins, NewValue, _OldValue) -> |