summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTristan Sloughter <t@crashfast.com>2015-07-28 20:36:14 -0500
committerTristan Sloughter <t@crashfast.com>2015-08-01 11:12:15 -0500
commit8b24b497399ab02a94ecfb65da3428e2b9f82417 (patch)
tree1aee9c251317b8ac77e4dbe2d7e984cb9cdc989a /src
parent7c46eea294ecce8338bee7e76a13a0390b7c5901 (diff)
only use upgrade on default deps
Diffstat (limited to 'src')
-rw-r--r--src/rebar_prv_upgrade.erl2
-rw-r--r--src/rebar_state.erl4
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) ->