Skip to content
Merged
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion src/Operations.jl
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@ function resolve_versions!(env::EnvCache, registries::Vector{Registry.RegistryIn
# 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
if old_v != new_v && haskey(compat_map[uuid], old_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
Expand Down Expand Up @@ -569,6 +569,10 @@ function resolve_versions!(env::EnvCache, registries::Vector{Registry.RegistryIn
deps_fixed
else
d = Dict{String, UUID}()
if !haskey(compat_map[pkg.uuid], pkg.version)
available_versions = sort!(collect(keys(compat_map[pkg.uuid])))
pkgerror("version $(pkg.version) of package $(pkg.name) is not available. Available versions: $(join(available_versions, ", "))")
end
for (uuid, _) in compat_map[pkg.uuid][pkg.version]
d[names[uuid]] = uuid
end
Expand Down