summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorYurii Rashkovskii <yrashk@gmail.com>2012-09-12 00:39:52 -0700
committerTuncer Ayaz <tuncer.ayaz@gmail.com>2012-09-15 18:58:02 +0200
commit9a57e060155cb2c73fb52bdbd80e5a173607478c (patch)
treef181ed5bd5f779bd859b22611b31cb244f4d2684 /src
parent22b703efa8d86c1fbd49273eda2c0252d93fd4fd (diff)
Restore ability to specify deps_dir on the command line
It was previously possible to run `rebar compile deps_dir=/path/to/deps`, but as of 70d27c5720331076f52e4fd7bcd1dc8045c8c86a, it was nixed.
Diffstat (limited to 'src')
-rw-r--r--src/rebar_deps.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rebar_deps.erl b/src/rebar_deps.erl
index 67652e3..699f189 100644
--- a/src/rebar_deps.erl
+++ b/src/rebar_deps.erl
@@ -185,7 +185,8 @@ setup_env(Config) ->
%% Sets a default if root config has no deps_dir set
set_shared_deps_dir(Config, []) ->
rebar_config:set_xconf(Config, deps_dir,
- rebar_config:get_local(Config, deps_dir, "deps"));
+ rebar_config:get_local(Config, deps_dir,
+ rebar_config:get_global(Config, deps_dir, "deps")));
set_shared_deps_dir(Config, _DepsDir) ->
Config.