Skip to content

Commit 7ce6159

Browse files
committed
Merge commit 'db20618756a90c4c3d7b8e6426d990114b4337f4'
2 parents fdb0e8a + db20618 commit 7ce6159

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

packages/CodeTracking/Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "CodeTracking"
22
uuid = "da1fd8a2-8d9e-5ec2-8556-3022fb5608a2"
33
authors = ["Tim Holy <[email protected]>"]
4-
version = "2.0.1"
4+
version = "2.0.2"
55

66
[deps]
77
InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"

packages/CodeTracking/src/CodeTracking.jl

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -354,10 +354,13 @@ Returns `nothing` if this package has not been loaded.
354354
pkgfiles(name::AbstractString, uuid::UUID) = pkgfiles(PkgId(uuid, name))
355355
function pkgfiles(name::AbstractString)
356356
project = Base.active_project()
357-
# The value returned by Base.project_deps_get depends on the Julia version
358-
id = isdefined(Base, :TOMLCache) && Base.VERSION < v"1.6.0-DEV.1180" ? Base.project_deps_get(project, name, Base.TOMLCache()) :
359-
Base.project_deps_get(project, name)
360-
(id == false || id === nothing) && error("no package ", name, " recognized")
357+
@static if VERSION v"1.14.0-DEV.13"
358+
id = Base.package_get_here(project, name)
359+
id.uuid === nothing && error("no package ", name, " recognized")
360+
else
361+
id = Base.project_deps_get(project, name)
362+
id === nothing && error("no package ", name, " recognized")
363+
end
361364
return isa(id, PkgId) ? pkgfiles(id) : pkgfiles(name, id)
362365
end
363366
pkgfiles(id::PkgId) = get(_pkgfiles, id, nothing)

0 commit comments

Comments
 (0)