Skip to content

Commit 861384c

Browse files
KristofferCKristofferCIanButterworth
committed
fix not hardcoding "Project.toml" when fixing up extensions in manifest (#3851)
* fix not hardcoding "Project.toml" when fixing up extensions in manifest file * abspath to be extra safe --------- Co-authored-by: KristofferC <kristoffer.carlsson@juliacomputing.com> Co-authored-by: Ian Butterworth <i.r.butterworth@gmail.com> (cherry picked from commit 8875120)
1 parent 99f6754 commit 861384c

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

src/Operations.jl

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,11 @@ end
167167
# about extensions
168168
function fixup_ext!(env::EnvCache)
169169
for pkg in values(env.manifest)
170-
v = joinpath(source_path(env.manifest_file, pkg), "Project.toml")
171-
if isfile(v)
172-
p = Types.read_project(v)
170+
# isfile_casesenstive within locate_project_file used to error on Windows if given a
171+
# relative path so abspath it to be extra safe https://github.com/JuliaLang/julia/pull/55220
172+
project_file = Base.locate_project_file(abspath(source_path(env.manifest_file, pkg)))
173+
if isfile(project_file)
174+
p = Types.read_project(project_file)
173175
pkg.weakdeps = p.weakdeps
174176
pkg.exts = p.exts
175177
for (name, _) in p.weakdeps

0 commit comments

Comments
 (0)