Skip to content

Commit 35167fe

Browse files
committed
fix import Pkg into precompilation processes
1 parent ee11d77 commit 35167fe

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

base/loading.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1066,6 +1066,7 @@ function create_expr_cache(input::String, output::String, concrete_deps::typeof(
10661066
try
10671067
write(in, """
10681068
begin
1069+
import Pkg
10691070
empty!(Base.LOAD_PATH)
10701071
append!(Base.LOAD_PATH, $(repr(LOAD_PATH, :module => nothing)))
10711072
empty!(Base.DEPOT_PATH)

base/sysimg.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -563,6 +563,8 @@ Base.require(Base, :Pkg)
563563
@deprecate_binding REPLCompletions root_module(Base, :REPL).REPLCompletions true ", use `REPL.REPLCompletions` instead"
564564
@deprecate_binding Terminals root_module(Base, :REPL).Terminals true ", use `REPL.Terminals` instead"
565565

566+
@deprecate_binding(Pkg, root_module(Base, :Pkg), true, ", run `import Pkg` instead")
567+
566568
@deprecate_stdlib readdlm DelimitedFiles true
567569
@deprecate_stdlib writedlm DelimitedFiles true
568570
@deprecate_stdlib readcsv DelimitedFiles true

stdlib/Pkg/test/pkg.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -409,13 +409,13 @@ temp_pkg_dir() do
409409
touch(depsbuild)
410410
# Pkg.build works without the src directory now
411411
# but it's probably fine to require it.
412-
msg = read(`$(Base.julia_cmd()) --startup-file=no -e 'redirect_stderr(STDOUT); using Logging; global_logger(SimpleLogger(STDOUT)); Pkg.build("BuildFail")'`, String)
412+
msg = read(`$(Base.julia_cmd()) --startup-file=no -e 'redirect_stderr(STDOUT); using Logging; global_logger(SimpleLogger(STDOUT)); import Pkg; Pkg.build("BuildFail")'`, String)
413413
@test contains(msg, "Building BuildFail")
414414
@test !contains(msg, "Build failed for BuildFail")
415415
open(depsbuild, "w") do fd
416416
println(fd, "error(\"Throw build error\")")
417417
end
418-
msg = read(`$(Base.julia_cmd()) --startup-file=no -e 'redirect_stderr(STDOUT); using Logging; global_logger(SimpleLogger(STDOUT)); Pkg.build("BuildFail")'`, String)
418+
msg = read(`$(Base.julia_cmd()) --startup-file=no -e 'redirect_stderr(STDOUT); using Logging; global_logger(SimpleLogger(STDOUT)); import Pkg; Pkg.build("BuildFail")'`, String)
419419
@test contains(msg, "Building BuildFail")
420420
@test contains(msg, "Build failed for BuildFail")
421421
@test contains(msg, "Pkg.build(\"BuildFail\")")
@@ -426,7 +426,7 @@ temp_pkg_dir() do
426426
let package = "Example"
427427
Pkg.rm(package) # Remove package if installed
428428
@test Pkg.installed(package) === nothing # Registered with METADATA but not installed
429-
msg = read(ignorestatus(`$(Base.julia_cmd()) --startup-file=no -e "redirect_stderr(STDOUT); using Logging; global_logger(SimpleLogger(STDOUT)); Pkg.build(\"$package\")"`), String)
429+
msg = read(ignorestatus(`$(Base.julia_cmd()) --startup-file=no -e "redirect_stderr(STDOUT); using Logging; global_logger(SimpleLogger(STDOUT)); import Pkg; Pkg.build(\"$package\")"`), String)
430430
@test contains(msg, "$package is not an installed package")
431431
@test !contains(msg, "signal (15)")
432432
end
@@ -541,7 +541,7 @@ temp_pkg_dir() do
541541

542542
Pkg.add(package)
543543
msg = read(ignorestatus(`$(Base.julia_cmd()) --startup-file=no -e
544-
"redirect_stderr(STDOUT); using Logging; global_logger(SimpleLogger(STDOUT)); using Example; Pkg.update(\"$package\")"`), String)
544+
"redirect_stderr(STDOUT); using Logging; global_logger(SimpleLogger(STDOUT)); using Example; import Pkg; Pkg.update(\"$package\")"`), String)
545545
@test contains(msg, Regex("- $package.*Restart Julia to use the updated versions","s"))
546546
end
547547

0 commit comments

Comments
 (0)