Skip to content

Commit

Permalink
Some safeguards while resolving names
Browse files Browse the repository at this point in the history
  • Loading branch information
carlobaldassi committed Dec 21, 2017
1 parent 3ac09aa commit 22d0077
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions src/Operations.jl
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,9 @@ function deps_graph(env::EnvCache, uuid_to_name::Dict{UUID,String}, reqs::Requir
end

for uuid in uuids
uuid_to_name[uuid] = registered_name(env, uuid)
try
uuid_to_name[uuid] = registered_name(env, uuid)
end
info = manifest_info(env, uuid)
info nothing && continue
uuid_to_name[UUID(info["uuid"])] = info["name"]
Expand All @@ -210,7 +212,7 @@ function resolve_versions!(env::EnvCache, pkgs::Vector{PackageSpec})::Dict{UUID,
push!(pkgs, PackageSpec(name, uuid, ver))
end
# construct data structures for resolver and call it
reqs = Requires(pkg.uuid => pkg.version for pkg in pkgs)
reqs = Requires(pkg.uuid => pkg.version for pkg in pkgs if pkg.uuid uuid_julia)
fixed = Dict([uuid_julia => Fixed(VERSION)])
graph = deps_graph(env, uuid_to_name, reqs, fixed)

Expand Down

0 comments on commit 22d0077

Please sign in to comment.