diff options
| author | Tristan Sloughter <tristan.sloughter@gmail.com> | 2015-02-23 15:22:17 -0600 |
|---|---|---|
| committer | Tristan Sloughter <tristan.sloughter@gmail.com> | 2015-02-23 15:22:17 -0600 |
| commit | e05f483043e770c2abdd8b4e6292d231b25cbc25 (patch) | |
| tree | 73d28366b637cf16beb69c2c9321addf0a5e67a7 /src/rebar_config.erl | |
| parent | 90bf65ed954b0cc06febbef934ba826050f1b7f7 (diff) | |
| parent | d6dc56da035774b39293f1370a374c39953d0995 (diff) | |
Merge pull request #178 from rebar/merge-lock-fix
Fix lock merging for nonexistant lock files.
Diffstat (limited to 'src/rebar_config.erl')
| -rw-r--r-- | src/rebar_config.erl | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/rebar_config.erl b/src/rebar_config.erl index 63b7af7..c1c4381 100644 --- a/src/rebar_config.erl +++ b/src/rebar_config.erl @@ -60,8 +60,13 @@ consult_file(File) -> end end. +%% no lockfile +merge_locks(Config, []) -> + Config; +%% empty lockfile merge_locks(Config, [[]]) -> Config; +%% lockfile with entries merge_locks(Config, [Locks]) -> {deps, ConfigDeps} = lists:keyfind(deps, 1, Config), %% We want the top level deps only from the lock file. |