Skip to content

Commit 35b2008

Browse files
committed
fix rebase error..
1 parent 6c445c4 commit 35b2008

File tree

1 file changed

+7
-19
lines changed

1 file changed

+7
-19
lines changed

base/precompilation.jl

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -73,21 +73,6 @@ function ExplicitEnv(envpath::String=Base.active_project())
7373
names[UUID(proj_uuid)] = proj_name
7474
end
7575

76-
#=
77-
if !project_is_package
78-
base_project_file = base_project(envpath)
79-
if base_project_file !== nothing
80-
base_project_d = parsed_toml(base_project_file)
81-
for (name, _uuid) in get(Dict{String, Any}, base_project_d, "deps")::Dict{String, Any}
82-
uuid = UUID(_uuid)
83-
project_deps[name] = uuid
84-
names[UUID(uuid)] = name
85-
project_uuid_to_name[name] = UUID(uuid)
86-
end
87-
end
88-
end
89-
=#
90-
9176
project_extensions = Dict{String, Vector{UUID}}()
9277
# Collect all extensions of the project
9378
for (name, triggers::Union{String, Vector{String}}) in get(Dict{String, Any}, project_d, "extensions")::Dict{String, Any}
@@ -574,11 +559,14 @@ function precompilepkgs(pkgs::Vector{String}=String[];
574559
target = "manifest"
575560
end
576561

577-
nconfig = length(configs)
578-
if nconfig > 1
579-
target *= " for $nconfig compilation configurations..."
580-
else
562+
nconfigs = length(configs)
563+
if nconfigs == 1
564+
if !isempty(only(configs)[1])
565+
target *= " for configuration $(join(only(configs)[1], " "))"
566+
end
581567
target *= "..."
568+
else
569+
target *= " for $nconfigs compilation configurations..."
582570
end
583571
@debug "precompile: packages filtered"
584572

0 commit comments

Comments
 (0)