diff options
| author | Fred Hebert <mononcqc@ferd.ca> | 2015-04-23 21:44:50 -0400 |
|---|---|---|
| committer | Fred Hebert <mononcqc@ferd.ca> | 2015-04-23 21:44:50 -0400 |
| commit | e79397eaebb04159fb4bdfaaecfd99c65cb93139 (patch) | |
| tree | 219c4605363acceec17b8fcf12aff0711c45f721 | |
| parent | c220753f9ecffa092772296e80763e943859e696 (diff) | |
| parent | ee0f4dcd60c5e9eaef4de61ba93af73e57f9d88a (diff) | |
Merge pull request #367 from tsloughter/merge_locks
merge_locks crashed if a config didn't have a deps entry
| -rw-r--r-- | src/rebar_config.erl | 2 |
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 |