Skip to content
Browse files

Merge pull request #100 from josevalim/patch-1

External deps_dir should have higher priority than the config one
  • Loading branch information...
2 parents 16eed82 + e467642 commit 3a9559651cf529885332b387240ef3f32823250a @dizzyd dizzyd committed Jun 17, 2013
Showing with 3 additions and 2 deletions.
  1. +3 −2 src/rebar_deps.erl
View
5 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.

0 comments on commit 3a95596

Please sign in to comment.
Something went wrong with that request. Please try again.