Merge pull request #2336 from JuliaLang/fe/backports-release-1.6

[release-1.6] More backports for Julia 1.6.0

Author: fredrikekre

src/API.jl

@@ -1083,7 +1083,11 @@ function precompile(ctx::Context; internal_call::Bool=false, kwargs...)
     for (pkg, deps) in depsmap # precompilation loop
         paths = Base.find_all_in_cache_path(pkg)
         sourcepath = Base.locate_package(pkg)
-        sourcepath === nothing && continue
+        if sourcepath === nothing
+            failed_deps[pkg] = "Error: Missing source file for $(pkg)"
+            notify(was_processed[pkg])
+            continue
+        end
         # Heuristic for when precompilation is disabled
         if occursin(r"\b__precompile__\(\s*false\s*\)", read(sourcepath, String))
             notify(was_processed[pkg])

src/Artifacts.jl

@@ -354,10 +354,22 @@ function download_artifact(
             msg  = "Tree Hash Mismatch!\n"
             msg *= "  Expected git-tree-sha1:   $(bytes2hex(tree_hash.bytes))\n"
             msg *= "  Calculated git-tree-sha1: $(bytes2hex(calc_hash.bytes))"
+            # Since tree hash calculation is still broken on some systems, e.g. Pkg.jl#1860,
+            # and Pkg.jl#2317 so we allow setting JULIA_PKG_IGNORE_HASHES=1 to ignore the
+            # error and move the artifact to the expected location and return true
+            ignore_hash = get(ENV, "JULIA_PKG_IGNORE_HASHES", nothing) == "1"
+            if ignore_hash
+                msg *= "\n\$JULIA_PKG_IGNORE_HASHES is set to 1: ignoring error and moving artifact to the expected location"
+            end
             @error(msg)
-            # Tree hash calculation is still broken on some systems, e.g. Pkg.jl#1860,
-            # so we return true here and only raise the warning on the lines above.
-            # return false
+            if ignore_hash
+                # Move it to the location we expected
+                src = artifact_path(calc_hash; honor_overrides=false)
+                dst = artifact_path(tree_hash; honor_overrides=false)
+                mv(src, dst; force=true)
+                return true
+            end
+            return false
         end
     end
 

src/Types.jl

@@ -1415,7 +1415,7 @@ function Base.:(==)(a::PackageInfo, b::PackageInfo)
     return a.name == b.name && a.version == b.version && a.tree_hash == b.tree_hash &&
         a.is_direct_dep == b.is_direct_dep &&
         a.is_pinned == b.is_pinned && a.is_tracking_path == b.is_tracking_path &&
-        a.is_tracking_repo == a.is_tracking_repo &&
+        a.is_tracking_repo == b.is_tracking_repo &&
         a.is_tracking_registry == b.is_tracking_registry &&
         a.git_revision == b.git_revision && a.git_source == b.git_source &&
         a.source == b.source && a.dependencies == b.dependencies

src/manifest.jl

@@ -96,7 +96,7 @@ function normalize_deps(name, uuid, deps::Vector{String}, manifest::Dict{String,
                      "but no such entry exists in the manifest.")
         end
         # should have used dict format instead of vector format
-        length(infos) == 1 || pkgerror("Invalid manfiest format. ",
+        length(infos) == 1 || pkgerror("Invalid manifest format. ",
                                        "`$name=$uuid`'s dependency on `$dep` is ambiguous.")
         final[dep] = infos[1].uuid
     end

test/artifacts.jl

@@ -268,17 +268,20 @@ end
 
     # Next, test incorrect download errors
     if !Sys.iswindows()
-        mktempdir() do dir
+        for ignore_hash in (false, true); withenv("JULIA_PKG_IGNORE_HASHES" => ignore_hash ? "1" : nothing) do; mktempdir() do dir
             with_artifacts_directory(dir) do
                 @test artifact_meta("broken_artifact", joinpath(badifact_dir, "incorrect_gitsha.toml")) != nothing
                 @test_logs (:error, r"Tree Hash Mismatch!") match_mode=:any begin
-                    # Only warn on wrong tree hash for now (see Pkg.jl#1885)
-                    # @test_throws ErrorException ensure_artifact_installed("broken_artifact", joinpath(badifact_dir, "incorrect_gitsha.toml"))
-                    path = ensure_artifact_installed("broken_artifact", joinpath(badifact_dir, "incorrect_gitsha.toml"))
-                    @test endswith(path, "0000000000000000000000000000000000000000")
+                    if !ignore_hash
+                        @test_throws ErrorException ensure_artifact_installed("broken_artifact", joinpath(badifact_dir, "incorrect_gitsha.toml"))
+                    else
+                        path = ensure_artifact_installed("broken_artifact", joinpath(badifact_dir, "incorrect_gitsha.toml"))
+                        @test endswith(path, "0000000000000000000000000000000000000000")
+                        @test isdir(path)
+                    end
                 end
             end
-        end
+        end end end
     end
 
     mktempdir() do dir

test/new.jl

@@ -1260,7 +1260,7 @@ end
         @test haskey(Pkg.project().dependencies, "Example")
         @test haskey(Pkg.project().dependencies, "Unicode")
     end end
-    # `instantiate` lonely manfiest
+    # `instantiate` lonely manifest
     isolate(loaded_depot=true) do
         manifest_dir = joinpath(@__DIR__, "manifest", "noproject")
         cd(manifest_dir) do
@@ -1947,7 +1947,7 @@ end
     # Manifest Status API
     isolate(loaded_depot=true) do
         io = PipeBuffer()
-        ## empty manfiest
+        ## empty manifest
         Pkg.status(;io=io, mode=Pkg.PKGMODE_MANIFEST)
         @test occursin(r"Status `.+Manifest\.toml` \(empty manifest\)", readline(io))
         # loaded manifest