summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/rebar_plugins.erl1
-rw-r--r--src/rebar_prv_test_deps.erl1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/rebar_plugins.erl b/src/rebar_plugins.erl
index 1916c11..0c47525 100644
--- a/src/rebar_plugins.erl
+++ b/src/rebar_plugins.erl
@@ -12,6 +12,7 @@
%% ===================================================================
install(State) ->
+ %% Set deps_dir to a different dir for plugin so they don't collide
DepsDir = rebar_state:get(State, deps_dir, ?DEFAULT_DEPS_DIR),
State1 = rebar_state:set(State, deps_dir, ?DEFAULT_PLUGINS_DIR),
expand_plugins(?DEFAULT_PLUGINS_DIR),
diff --git a/src/rebar_prv_test_deps.erl b/src/rebar_prv_test_deps.erl
index c9cd127..c77f1c0 100644
--- a/src/rebar_prv_test_deps.erl
+++ b/src/rebar_prv_test_deps.erl
@@ -35,6 +35,7 @@ do(State) ->
Names = [ec_cnv:to_binary(element(1, Dep)) || Dep <- TestDeps],
ProjectApps1 = [rebar_app_info:deps(A, Names) || A <- ProjectApps],
+ %% Set deps_dir to a different dir for test deps so they don't collide
TestDepsDir = rebar_state:get(State, test_deps_dir, ?DEFAULT_TEST_DEPS_DIR),
DepsDir = rebar_state:get(State, deps_dir, ?DEFAULT_DEPS_DIR),
State1 = rebar_state:set(State, deps_dir, TestDepsDir),