From b1478f917237c56dd3f78135b77c96c897dd3b95 Mon Sep 17 00:00:00 2001 From: Kristoffer Date: Tue, 23 Jul 2024 15:39:14 +0200 Subject: [PATCH 1/3] Artifacts: use a different way of getting the UUID of a module --- stdlib/Artifacts/src/Artifacts.jl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stdlib/Artifacts/src/Artifacts.jl b/stdlib/Artifacts/src/Artifacts.jl index bd44369655ae4..bfc884cc30634 100644 --- a/stdlib/Artifacts/src/Artifacts.jl +++ b/stdlib/Artifacts/src/Artifacts.jl @@ -545,10 +545,10 @@ function jointail(dir, tail) end function _artifact_str(__module__, artifacts_toml, name, path_tail, artifact_dict, hash, platform, @nospecialize(lazyartifacts)) - moduleroot = Base.moduleroot(__module__) - if haskey(Base.module_keys, moduleroot) + pkg = Base.PkgId(__module__) + if pkg.uuid !== nothing # Process overrides for this UUID, if we know what it is - process_overrides(artifact_dict, Base.module_keys[moduleroot].uuid) + process_overrides(artifact_dict, pkg.uuid) end # If the artifact exists, we're in the happy path and we can immediately From 8d171f4c19233de285d0e16620f9e5df50329076 Mon Sep 17 00:00:00 2001 From: Kristoffer Carlsson Date: Tue, 23 Jul 2024 17:07:01 +0200 Subject: [PATCH 2/3] fix using module root --- stdlib/Artifacts/src/Artifacts.jl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stdlib/Artifacts/src/Artifacts.jl b/stdlib/Artifacts/src/Artifacts.jl index bfc884cc30634..2f605248aed2b 100644 --- a/stdlib/Artifacts/src/Artifacts.jl +++ b/stdlib/Artifacts/src/Artifacts.jl @@ -545,7 +545,8 @@ function jointail(dir, tail) end function _artifact_str(__module__, artifacts_toml, name, path_tail, artifact_dict, hash, platform, @nospecialize(lazyartifacts)) - pkg = Base.PkgId(__module__) + moduleroot = Base.moduleroot(__module__) + pkg = Base.PkgId(moduleroot) if pkg.uuid !== nothing # Process overrides for this UUID, if we know what it is process_overrides(artifact_dict, pkg.uuid) From 63661620aad5a50de6c1fff238f2c292a6d4d7b5 Mon Sep 17 00:00:00 2001 From: Kristoffer Date: Tue, 23 Jul 2024 17:24:07 +0200 Subject: [PATCH 3/3] Revert "fix using module root" This reverts commit 8d171f4c19233de285d0e16620f9e5df50329076. --- stdlib/Artifacts/src/Artifacts.jl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/stdlib/Artifacts/src/Artifacts.jl b/stdlib/Artifacts/src/Artifacts.jl index 2f605248aed2b..bfc884cc30634 100644 --- a/stdlib/Artifacts/src/Artifacts.jl +++ b/stdlib/Artifacts/src/Artifacts.jl @@ -545,8 +545,7 @@ function jointail(dir, tail) end function _artifact_str(__module__, artifacts_toml, name, path_tail, artifact_dict, hash, platform, @nospecialize(lazyartifacts)) - moduleroot = Base.moduleroot(__module__) - pkg = Base.PkgId(moduleroot) + pkg = Base.PkgId(__module__) if pkg.uuid !== nothing # Process overrides for this UUID, if we know what it is process_overrides(artifact_dict, pkg.uuid)