diff --git a/src/Prefix.jl b/src/Prefix.jl index a1c735f3..f4504963 100644 --- a/src/Prefix.jl +++ b/src/Prefix.jl @@ -613,7 +613,7 @@ function get_addable_spec(name::AbstractString, version::VersionNumber; continue end - pkg_info = registry_info(reg[uuid]) + pkg_info = registry_info(reg, reg[uuid]) if pkg_info.repo !== nothing push!(repo_urls, pkg_info.repo) end diff --git a/src/compat.jl b/src/compat.jl index d320f228..dcc54a71 100644 --- a/src/compat.jl +++ b/src/compat.jl @@ -31,7 +31,14 @@ else end if isdefined(Pkg, :Registry) && isdefined(Pkg.Registry, :registry_info) - const registry_info = Pkg.Registry.registry_info + const _Pkg_registry_info = Pkg.Registry.registry_info elseif isdefined(Pkg, :RegistryHandling) && isdefined(Pkg.RegistryHandling, :registry_info) - const registry_info = Pkg.RegistryHandling.registry_info + const _Pkg_registry_info = Pkg.RegistryHandling.registry_info +end + +# Handle Pkg.jl signature change: registry_info(pkg) -> registry_info(registry, pkg) +if @isdefined(_Pkg_registry_info) && hasmethod(_Pkg_registry_info, Tuple{Pkg.Registry.PkgEntry}) + registry_info(::Pkg.Registry.RegistryInstance, pkg::Pkg.Registry.PkgEntry) = _Pkg_registry_info(pkg) +else + const registry_info = _Pkg_registry_info end