@@ -564,8 +564,8 @@ function manifest_deps_get(env::String, where::PkgId, name::String)::Union{Nothi
564
564
return PkgId (pkg_uuid, name)
565
565
end
566
566
# Check for this being a dependency to a glue module
567
- glue_dep = project_file_gluedeps_get (project_file, where , name)
568
- glue_dep === nothing || return glue_dep
567
+ # glue_dep = project_file_gluedeps_get(project_file, where, name)
568
+ # glue_dep === nothing || return glue_dep
569
569
# look for manifest file and `where` stanza
570
570
return explicit_manifest_deps_get (project_file, where , name)
571
571
elseif project_file
@@ -583,7 +583,7 @@ function manifest_uuid_path(env::String, pkg::PkgId)::Union{Nothing,String,Missi
583
583
# if `pkg` matches the project, return the project itself
584
584
return project_file_path (project_file)
585
585
end
586
- # Only used when the package is loading the glue pkg itself
586
+ # Only used when the project is loading the glue pkg itself
587
587
# which is currently not supported
588
588
# mby_glue = project_file_glue_path(project_file, pkg.name)
589
589
# mby_glue === nothing || return mby_glue
@@ -606,7 +606,6 @@ function project_file_name_uuid(project_file::String, name::String)::PkgId
606
606
end
607
607
608
608
function project_file_gluedeps_get (project_file:: String , where :: PkgId , name:: String )
609
- # Check for glue...
610
609
d = parsed_toml (project_file)
611
610
glue = get (d, " gluepkgs" , nothing ):: Union{Dict{String, Any}, Nothing}
612
611
project_id = project_file_name_uuid (project_file, " " )
@@ -618,7 +617,8 @@ function project_file_gluedeps_get(project_file::String, where::PkgId, name::Str
618
617
gluedepses = get (d, " gluedeps" , nothing ):: Union{Dict{String, Any}, Nothing}
619
618
return PkgId (UUID (gluedepses[name]:: String ), name)
620
619
end
621
- name == project_id. name && return project_id
620
+ # Fall back to normal rules for loading a dep for a a package
621
+ return identify_package (project_id, name)
622
622
end
623
623
end
624
624
return nothing
@@ -831,6 +831,8 @@ function explicit_manifest_deps_get(project_file::String, where::PkgId, name::St
831
831
end
832
832
end
833
833
end
834
+ # `name` is not a glue pkg, do standard lookup as if this was the parent
835
+ return identify_package (PkgId (UUID (uuid), dep_name), name)
834
836
end
835
837
end
836
838
end
0 commit comments