summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Sloughter <t@crashfast.com>2015-04-23 20:40:22 -0500
committerTristan Sloughter <t@crashfast.com>2015-04-23 20:40:22 -0500
commitee0f4dcd60c5e9eaef4de61ba93af73e57f9d88a (patch)
tree219c4605363acceec17b8fcf12aff0711c45f721
parentd94c561627a90312b9dc0b680d69ab523474efb3 (diff)
merge_locks crashed if a config didn't have a deps entry
-rw-r--r--src/rebar_config.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rebar_config.erl b/src/rebar_config.erl
index 58b2c4d..c858fef 100644
--- a/src/rebar_config.erl
+++ b/src/rebar_config.erl
@@ -69,7 +69,7 @@ merge_locks(Config, [[]]) ->
Config;
%% lockfile with entries
merge_locks(Config, [Locks]) ->
- {deps, ConfigDeps} = lists:keyfind(deps, 1, Config),
+ ConfigDeps = proplists:get_value(deps, Config, []),
%% We want the top level deps only from the lock file.
%% This ensures deterministic overrides for configs.
%% Then check if any new deps have been added to the config