Skip to content

Commit b5d0845

Browse files
author
KristofferC
committed
some more cleanups
1 parent e727b57 commit b5d0845

File tree

2 files changed

+44
-16
lines changed

2 files changed

+44
-16
lines changed

base/loading.jl

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -639,19 +639,6 @@ function project_deps_get(env::String, name::String)::Union{Nothing,PkgId}
639639
return nothing
640640
end
641641

642-
function base_package_get(project_file::String, where::PkgId, name::String)
643-
base = base_project(project_file)
644-
if base !== nothing
645-
pkg = package_get(base, where, name)
646-
if pkg !== nothing
647-
return pkg
648-
else
649-
return base_package_get(base, where, name)
650-
end
651-
end
652-
return nothing
653-
end
654-
655642
function package_get(project_file, where::PkgId, name::String)
656643
proj = project_file_name_uuid(project_file, where.name)
657644
if proj == where
@@ -669,8 +656,6 @@ function manifest_deps_get(env::String, where::PkgId, name::String)::Union{Nothi
669656
if project_file isa String
670657
pkg = package_get(project_file, where, name)
671658
pkg === nothing || return pkg
672-
pkg = base_package_get(project_file, where, name)
673-
pkg === nothing || return pkg
674659
d = parsed_toml(project_file)
675660
exts = get(d, "extensions", nothing)::Union{Dict{String, Any}, Nothing}
676661
if exts !== nothing

test/project/SubProject/Manifest.toml

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ julia_version = "1.12.0-DEV"
44
manifest_format = "2.0"
55
project_hash = "620b9377bc807ff657e6618c8ccc24887eb40285"
66

7+
[[deps.Base64]]
8+
uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
9+
version = "1.11.0"
10+
711
[[deps.Devved]]
812
path = "Devved"
913
uuid = "cbce3a6e-7a3d-4e84-8e6d-b87208df7599"
@@ -14,12 +18,51 @@ path = "Devved2"
1418
uuid = "08f74b90-50f5-462f-80b9-a72b1258a17b"
1519
version = "0.1.0"
1620

21+
[[deps.InteractiveUtils]]
22+
deps = ["Markdown"]
23+
uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
24+
version = "1.11.0"
25+
26+
[[deps.Logging]]
27+
deps = ["StyledStrings"]
28+
uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
29+
version = "1.11.0"
30+
31+
[[deps.Markdown]]
32+
deps = ["Base64"]
33+
uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
34+
version = "1.11.0"
35+
1736
[[deps.MyPkg]]
37+
deps = ["Devved", "Devved2"]
1838
path = "."
1939
uuid = "0cafdeb2-d7a2-40d0-8d22-4411fcc2c4ee"
20-
version = "0.1.0"
40+
version = "0.0.0"
2141

2242
[[deps.PackageThatIsSub]]
43+
deps = ["Devved2", "MyPkg"]
2344
path = "PackageThatIsSub"
2445
uuid = "1efb588c-9412-4e40-90a4-710420bd84aa"
2546
version = "0.1.0"
47+
48+
[[deps.Random]]
49+
deps = ["SHA"]
50+
uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
51+
version = "1.11.0"
52+
53+
[[deps.SHA]]
54+
uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
55+
version = "0.7.0"
56+
57+
[[deps.Serialization]]
58+
uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
59+
version = "1.11.0"
60+
61+
[[deps.StyledStrings]]
62+
uuid = "f489334b-da3d-4c2e-b8f0-e476e12c162b"
63+
version = "1.11.0"
64+
65+
[[deps.Test]]
66+
deps = ["InteractiveUtils", "Logging", "Random", "Serialization"]
67+
uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
68+
version = "1.11.0"

0 commit comments

Comments
 (0)