Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release-1.10] 1.10 backports #4132

Merged
merged 1 commit into from
Jan 10, 2025
Merged

[release-1.10] 1.10 backports #4132

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/Operations.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,13 @@ function resolve_versions!(env::EnvCache, registries::Vector{Registry.RegistryIn
old_v = get(jll_fix, uuid, nothing)
# We only fixup a JLL if the old major/minor/patch matches the new major/minor/patch
if old_v !== nothing && Base.thispatch(old_v) == Base.thispatch(vers_fix[uuid])
new_v = vers_fix[uuid]
if old_v != new_v
compat_map[uuid][old_v] = compat_map[uuid][new_v]
# Note that we don't delete!(compat_map[uuid], old_v) because we want to keep the compat info around
# in case there's JLL version confusion between the sysimage pkgorigins version and manifest
# but that issue hasn't been fully specified, so keep it to be cautious
end
vers_fix[uuid] = old_v
end
end
Expand Down
Loading