diff options
| author | Dave Smith <dizzyd@dizzyd.com> | 2013-06-17 15:05:10 -0700 |
|---|---|---|
| committer | Dave Smith <dizzyd@dizzyd.com> | 2013-06-17 15:05:10 -0700 |
| commit | 3a9559651cf529885332b387240ef3f32823250a (patch) | |
| tree | 6cab2711b3f530664a8b3ff4749c1d404957b5cb /src | |
| parent | 16eed82ae4b04cc9ac0d6542918c79c3988470d2 (diff) | |
| parent | e467642476266b259be93ce6750bc27daeb57cee (diff) | |
Merge pull request #100 from josevalim/patch-1
External deps_dir should have higher priority than the config one
Diffstat (limited to 'src')
| -rw-r--r-- | src/rebar_deps.erl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/rebar_deps.erl b/src/rebar_deps.erl index 313deaa..9f9fc5d 100644 --- a/src/rebar_deps.erl +++ b/src/rebar_deps.erl @@ -241,10 +241,11 @@ info_help(Description) -> %% Added because of trans deps, %% need all deps in same dir and should be the one set by the root rebar.config +%% In case one is given globally, it has higher priority %% Sets a default if root config has no deps_dir set set_shared_deps_dir(Config, []) -> - GlobalDepsDir = rebar_config:get_global(Config, deps_dir, "deps"), - DepsDir = rebar_config:get_local(Config, deps_dir, GlobalDepsDir), + LocalDepsDir = rebar_config:get_local(Config, deps_dir, "deps"), + DepsDir = rebar_config:get_global(Config, deps_dir, LocalDepsDir), rebar_config:set_xconf(Config, deps_dir, DepsDir); set_shared_deps_dir(Config, _DepsDir) -> Config. |