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

Handle new Manifest.toml format #629

Merged
merged 1 commit into from
Jun 7, 2021
Merged

Handle new Manifest.toml format #629

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 10 additions & 2 deletions src/pkgs.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,11 @@ manifest_file() = manifest_file(Base.active_project())

if isdefined(Base, :explicit_manifest_entry_path)
function manifest_paths!(pkgpaths::Dict, manifest_file::String)
d = Base.parsed_toml(manifest_file)
d = if isdefined(Base, :get_deps) # `get_deps` is present in versions that support new manifest formats
Base.get_deps(Base.parsed_toml(manifest_file))
else
Base.parsed_toml(manifest_file)
end
for (name, entries) in d
entries::Vector{Any}
for entry in entries
Expand All @@ -413,7 +417,11 @@ else
# Legacy (delete when Julia 1.6 or higher is the minimum supported version)
if isdefined(Base, :TOMLCache)
function manifest_paths!(pkgpaths::Dict, manifest_file::String)
d = Base.parsed_toml(manifest_file)
d = if isdefined(Base, :get_deps) # `get_deps` is present in versions that support new manifest formats
Base.get_deps(Base.parsed_toml(manifest_file))
else
Base.parsed_toml(manifest_file)
end
for (name, entries) in d
entries::Vector{Any}
for info in entries
Expand Down