Skip to content

Commit ad1f1ac

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>
1 parent d092845 commit ad1f1ac

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
@@ -180,9 +180,11 @@ end
180180
# about extensions
181181
function fixup_ext!(env::EnvCache)
182182
for pkg in values(env.manifest)
183-
v = joinpath(source_path(env.manifest_file, pkg), "Project.toml")
184-
if isfile(v)
185-
p = Types.read_project(v)
183+
# isfile_casesenstive within locate_project_file used to error on Windows if given a
184+
# relative path so abspath it to be extra safe https://github.com/JuliaLang/julia/pull/55220
185+
project_file = Base.locate_project_file(abspath(source_path(env.manifest_file, pkg)))
186+
if isfile(project_file)
187+
p = Types.read_project(project_file)
186188
pkg.weakdeps = p.weakdeps
187189
pkg.exts = p.exts
188190
for (name, _) in p.weakdeps

0 commit comments

Comments
 (0)