Skip to content

Commit 563c966

Browse files
authored
Revert "allow finding stdlibs that are normal packages in the manifest but are now stdlibs" (#60101)
1 parent 8795edd commit 563c966

File tree

4 files changed

+1
-69
lines changed

4 files changed

+1
-69
lines changed

base/loading.jl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -463,8 +463,6 @@ function locate_package_env(pkg::PkgId, stopenv::Union{String, Nothing}=nothing)
463463
path = manifest_uuid_path(env, pkg)
464464
# missing is used as a sentinel to stop looking further down in envs
465465
if path === missing
466-
# Before stopping, try stdlib fallback
467-
is_stdlib(pkg) && @goto stdlib_fallback
468466
path = nothing
469467
@goto done
470468
end
@@ -476,7 +474,6 @@ function locate_package_env(pkg::PkgId, stopenv::Union{String, Nothing}=nothing)
476474
stopenv == env && break
477475
end
478476
end
479-
@label stdlib_fallback
480477
# Allow loading of stdlibs if the name/uuid are given
481478
# e.g. if they have been explicitly added to the project/manifest
482479
mbypath = manifest_uuid_path(Sys.STDLIB, pkg)

test/loading.jl

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1537,21 +1537,12 @@ end
15371537
mktempdir() do depot
15381538
# This manifest has a LibGit2 entry that is missing LibGit2_jll, which should be
15391539
# handled by falling back to the stdlib Project.toml for dependency truth.
1540-
badmanifest_test_dir = joinpath(@__DIR__, "project", "deps", "BadStdlibDeps")
1540+
badmanifest_test_dir = joinpath(@__DIR__, "project", "deps", "BadStdlibDeps.jl")
15411541
@test success(addenv(
15421542
`$(Base.julia_cmd()) --project=$badmanifest_test_dir --startup-file=no -e 'using LibGit2'`,
15431543
"JULIA_DEPOT_PATH" => depot * Base.Filesystem.pathsep(),
15441544
))
15451545
end
1546-
mktempdir() do depot
1547-
# This manifest has a LibGit2 entry that has a LibGit2_jll with a git-tree-hash1
1548-
# which simulates an old manifest where LibGit2_jll was not a stdlib
1549-
badmanifest_test_dir2 = joinpath(@__DIR__, "project", "deps", "BadStdlibDeps2")
1550-
@test success(addenv(
1551-
`$(Base.julia_cmd()) --project=$badmanifest_test_dir2 --startup-file=no -e 'using LibGit2'`,
1552-
"JULIA_DEPOT_PATH" => depot * Base.Filesystem.pathsep(),
1553-
))
1554-
end
15551546
end
15561547

15571548
@testset "code coverage disabled during precompilation" begin

test/project/deps/BadStdlibDeps2/Manifest.toml

Lines changed: 0 additions & 54 deletions
This file was deleted.

test/project/deps/BadStdlibDeps2/Project.toml

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)