From 6848b1e0bf1e33f8dc7d2fe930977fbc89a641d0 Mon Sep 17 00:00:00 2001 From: Ian Butterworth Date: Thu, 21 Nov 2024 13:41:35 -0500 Subject: [PATCH 1/2] precompilepkgs: fix is_direct_dep -> is_project_dep --- base/precompilation.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/precompilation.jl b/base/precompilation.jl index 34dd4c4df9cb9..751a019bc1a0d 100644 --- a/base/precompilation.jl +++ b/base/precompilation.jl @@ -911,7 +911,7 @@ function _precompilepkgs(pkgs::Vector{String}, if err isa ErrorException || (err isa ArgumentError && startswith(err.msg, "Invalid header in cache file")) errmsg = String(take!(get(IOBuffer, std_outputs, pkg_config))) delete!(std_outputs, pkg_config) # so it's not shown as warnings, given error report - failed_deps[pkg_config] = (strict || is_direct_dep) ? string(sprint(showerror, err), "\n", strip(errmsg)) : "" + failed_deps[pkg_config] = (strict || is_project_dep) ? string(sprint(showerror, err), "\n", strip(errmsg)) : "" !fancyprint && lock(print_lock) do println(io, " "^9, color_string(" ✗ ", Base.error_color()), name) end From 707554c8e94a31c63999065ff097d9794b2b1bd9 Mon Sep 17 00:00:00 2001 From: Cody Tapscott Date: Thu, 21 Nov 2024 15:02:54 -0500 Subject: [PATCH 2/2] Rename `is_direct_dep` -> `is_project_dep` in `describe_pkg` --- base/precompilation.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/precompilation.jl b/base/precompilation.jl index 751a019bc1a0d..77e088f455fea 100644 --- a/base/precompilation.jl +++ b/base/precompilation.jl @@ -425,9 +425,9 @@ function _precompilepkgs(pkgs::Vector{String}, # inverse map of `parent_to_ext` above (ext → parent) ext_to_parent = Dict{Base.PkgId, Base.PkgId}() - function describe_pkg(pkg::PkgId, is_direct_dep::Bool, flags::Cmd, cacheflags::Base.CacheFlags) + function describe_pkg(pkg::PkgId, is_project_dep::Bool, flags::Cmd, cacheflags::Base.CacheFlags) name = haskey(ext_to_parent, pkg) ? string(ext_to_parent[pkg].name, " → ", pkg.name) : pkg.name - name = is_direct_dep ? name : color_string(name, :light_black) + name = is_project_dep ? name : color_string(name, :light_black) if nconfigs > 1 && !isempty(flags) config_str = join(flags, " ") name *= color_string(" `$config_str`", :light_black)