Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix handling of nothing in init_load_path #54382

Merged
merged 2 commits into from
May 7, 2024
Merged

fix handling of nothing in init_load_path #54382

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbf9c4f
fix handling of `nothing` in init_load_path
topolarity May 5, 2024
b430454
Fix `env` check
topolarity May 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions base/initdefs.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,14 @@ function init_load_path()
if haskey(ENV, "JULIA_LOAD_PATH")
paths = parse_load_path(ENV["JULIA_LOAD_PATH"])
else
paths = filter!(env -> env !== nothing,
String[env == "@." ? current_project() : env for env in DEFAULT_LOAD_PATH])
paths = String[]
for env in DEFAULT_LOAD_PATH
if env == "@."
env = current_project()
env === nothing && continue
end
push!(paths, env)
end
end
append!(empty!(LOAD_PATH), paths)
end
Expand Down