When using a custom depot, still look in bundled directories.

JuliaLang · Sep 25, 2023 · 1284d6f · 1284d6f
1 parent 13d3efb
commit 1284d6f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/base/initdefs.jl b/base/initdefs.jl
@@ -86,9 +86,7 @@ See also [`JULIA_DEPOT_PATH`](@ref JULIA_DEPOT_PATH), and
 """
 const DEPOT_PATH = String[]
 
-function append_default_depot_path!(DEPOT_PATH)
-    path = joinpath(homedir(), ".julia")
-    path in DEPOT_PATH || push!(DEPOT_PATH, path)
+function append_bundled_depot_path!(DEPOT_PATH)
     path = abspath(Sys.BINDIR, "..", "local", "share", "julia")
     path in DEPOT_PATH || push!(DEPOT_PATH, path)
     path = abspath(Sys.BINDIR, "..", "share", "julia")
@@ -98,21 +96,26 @@ end
 
 function init_depot_path()
     empty!(DEPOT_PATH)
+    populated = false
+
     if haskey(ENV, "JULIA_DEPOT_PATH")
         str = ENV["JULIA_DEPOT_PATH"]
-        isempty(str) && return
         for path in eachsplit(str, Sys.iswindows() ? ';' : ':')
-            if isempty(path)
-                append_default_depot_path!(DEPOT_PATH)
-            else
-                path = expanduser(path)
-                path in DEPOT_PATH || push!(DEPOT_PATH, path)
-            end
+            isempty(path) && continue
+            path = expanduser(path)
+            path in DEPOT_PATH || push!(DEPOT_PATH, path)
+            populated = true
         end
-    else
-        append_default_depot_path!(DEPOT_PATH)
     end
-    nothing
+
+    if !populated
+        path = joinpath(homedir(), ".julia")
+        push!(DEPOT_PATH, path)
+    end
+
+    append_bundled_depot_path!(DEPOT_PATH)
+
+    return
 end
 
 ## LOAD_PATH & ACTIVE_PROJECT ##

diff --git a/test/loading.jl b/test/loading.jl
@@ -721,7 +721,7 @@ end
 @testset "expansion of JULIA_DEPOT_PATH" begin
     s = Sys.iswindows() ? ';' : ':'
     tmp = "/this/does/not/exist"
-    DEFAULT = Base.append_default_depot_path!(String[])
+    DEFAULT = Base.append_bundled_depot_path!(String[])
     cases = Dict{Any,Vector{String}}(
         nothing => DEFAULT,
         "" => [],