File tree Expand file tree Collapse file tree 2 files changed +32
-1
lines changed
Expand file tree Collapse file tree 2 files changed +32
-1
lines changed Original file line number Diff line number Diff line change 1+ [1;33mdiff --git a/lib/mix/lib/mix/tasks/deps.loadpaths.ex b/lib/mix/lib/mix/tasks/deps.loadpaths.ex[m
2+ [1;33mindex 671db2a..8ef1361 100644[m
3+ [1;33m--- a/lib/mix/lib/mix/tasks/deps.loadpaths.ex[m
4+ [1;33m+++ b/lib/mix/lib/mix/tasks/deps.loadpaths.ex[m
5+ [1;35m@@ -33,7 +33,9 @@[m [mdefmodule Mix.Tasks.Deps.Loadpaths do[m
6+ path[m
7+ end[m
8+ [m
9+ [1;31m- prune_deps(load_paths, "--no-deps-check" in args or System.get_env("MIX_NO_DEPS") in ~w(1 true))[m
10+ [1;32m+[m[1;32m unless "--no-deps-check" in args or System.get_env("MIX_NO_DEPS") in ~w(1 true) do[m
11+ [1;32m+[m[1;32m prune_deps(load_paths)[m
12+ [1;32m+[m[1;32m end[m
13+ end[m
14+ [m
15+ # If the build is per environment, we should be able to look[m
16+ [1;35m@@ -46,11 +48,10 @@[m [mdefmodule Mix.Tasks.Deps.Loadpaths do[m
17+ # We also expect env_path to be nil. If it is not nil, it means[m
18+ # it was set by a parent application and the parent application[m
19+ # should be the one doing the pruning.[m
20+ [1;31m- defp prune_deps(load_paths, no_check?) do[m
21+ [1;32m+[m[1;32m defp prune_deps(load_paths) do[m
22+ config = Mix.Project.config[m
23+ [m
24+ [1;31m- shared_build? =[m
25+ [1;31m- no_check? or config[:build_path] != nil or config[:build_per_environment] == false[m
26+ [1;32m+[m[1;32m shared_build? = config[:build_path] != nil or config[:build_per_environment] == false[m
27+ [m
28+ config[m
29+ |> Mix.Project.build_path[m
Original file line number Diff line number Diff line change @@ -33,7 +33,9 @@ defmodule Mix.Tasks.Deps.Loadpaths do
3333 path
3434 end
3535
36- prune_deps ( load_paths , "--no-deps-check" in args or System . get_env ( "MIX_NO_DEPS" ) in ~w( 1 true) )
36+ unless System . get_env ( "MIX_NO_DEPS" ) in ~w( 1 true) do
37+ prune_deps ( load_paths , "--no-deps-check" in args )
38+ end
3739 end
3840
3941 # If the build is per environment, we should be able to look
You can’t perform that action at this time.
0 commit comments