From f1ce28a46ce3f1961231fe60bb01ae683acaa189 Mon Sep 17 00:00:00 2001 From: Ian Date: Thu, 3 Jun 2021 01:27:08 -0400 Subject: [PATCH] handle new manifest format --- src/pkgs.jl | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/pkgs.jl b/src/pkgs.jl index 3b1cc929..d1b13d98 100644 --- a/src/pkgs.jl +++ b/src/pkgs.jl @@ -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 @@ -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