From 6100cfe3da0151bceea0fbc3846a656b88762ae2 Mon Sep 17 00:00:00 2001
From: Ian Butterworth <i.r.butterworth@gmail.com>
Date: Thu, 3 Dec 2020 08:03:25 -0500
Subject: [PATCH] Precomp: Missing fix from #2251 (Work around precompiling
 packages with no `version` entry) (#2261)

* missing change from workaround packages with no version entry #2251

* ensure one more print loop to tidy up the last task

* put a bit of random offset into the spinner animations

* include a package with no version number in tests

(cherry picked from commit f9b60d4b5e157259c82833ec53eb8478150ede15)
---
 src/API.jl  | 13 +++++++++----
 test/api.jl |  5 +++++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/API.jl b/src/API.jl
index 44ea6a0023..e2ffa1eaa8 100644
--- a/src/API.jl
+++ b/src/API.jl
@@ -1004,7 +1004,7 @@ function precompile(ctx::Context; internal_call::Bool=false, kwargs...)
                 println(io, " Interrupted: Exiting precompilation...")
             end
         else
-            rethrow(err)
+            @error "Pkg.precompile error" exception=(err, catch_backtrace())
         end
     end
 
@@ -1023,6 +1023,7 @@ function precompile(ctx::Context; internal_call::Bool=false, kwargs...)
             bar = MiniProgressBar(; indent=2, header = "Progress", color = Base.info_color(), percentage=false, always_reprint=true)
             n_total = length(depsmap)
             bar.max = n_total - n_already_precomp
+            final_loop = false
             while !printloop_should_exit
                 lock(print_lock) do
                     term_size = Base.displaysize(stdout)::Tuple{Int,Int}
@@ -1053,7 +1054,9 @@ function precompile(ctx::Context; internal_call::Bool=false, kwargs...)
                                 filter!(!isequal(dep), pkg_queue)
                             end
                         elseif started[dep]
-                            anim_char = anim_chars[i % length(anim_chars) + 1]
+                            # Offset each spinner animation using the first character in the package name as the seed.
+                            # If not offset, on larger terminal fonts it looks odd that they all sync-up
+                            anim_char = anim_chars[(i + Int(dep.name[1])) % length(anim_chars) + 1]
                             anim_char_colored = dep in direct_deps ? anim_char : color_string(anim_char, :light_black)
                             str *= string("  $anim_char_colored ", name, "\n")
                         else
@@ -1063,7 +1066,8 @@ function precompile(ctx::Context; internal_call::Bool=false, kwargs...)
                     last_length = length(pkg_queue_show)
                     print(io, str)
                 end
-                printloop_should_exit = interrupted_or_done.set
+                printloop_should_exit = interrupted_or_done.set && final_loop
+                final_loop = interrupted_or_done.set # ensures one more loop to tidy last task after finish
                 i += 1
                 wait(t)
             end
@@ -1092,7 +1096,8 @@ function precompile(ctx::Context; internal_call::Bool=false, kwargs...)
 
                 suspended = if haskey(man, pkg.uuid) # to handle the working environment uuid
                     pkgent = man[pkg.uuid]
-                    precomp_suspended(PackageSpec(uuid = pkg.uuid, name = pkgent.name, version = pkgent.version, tree_hash = pkgent.tree_hash))
+                    pkgver = something(pkgent.version, VersionSpec())
+                    precomp_suspended(PackageSpec(uuid = pkg.uuid, name = pkgent.name, version = pkgver, tree_hash = pkgent.tree_hash))
                 else
                     false
                 end
diff --git a/test/api.jl b/test/api.jl
index 098def7e80..2907be2f41 100644
--- a/test/api.jl
+++ b/test/api.jl
@@ -108,6 +108,10 @@ end
             Pkg.generate("Dep3")
             Pkg.generate("Dep4")
             Pkg.generate("Dep5")
+            Pkg.generate("NoVersion")
+            open(joinpath("NoVersion","Project.toml"), "w") do io
+                write(io, "name = \"NoVersion\"\nuuid = \"$(UUIDs.uuid4())\"")
+            end
             Pkg.generate("BrokenDep")
             open(joinpath("BrokenDep","src","BrokenDep.jl"), "w") do io
                 write(io, "module BrokenDep\nerror()\nend")
@@ -128,6 +132,7 @@ end
         ENV["JULIA_PKG_PRECOMPILE_AUTO"]=1
         println("Auto precompilation enabled")
         Pkg.develop(Pkg.PackageSpec(path="packages/Dep4"))
+        Pkg.develop(Pkg.PackageSpec(path="packages/NoVersion")) # a package with no version number
         Pkg.build(io=iob) # should trigger auto-precomp
         @test occursin("Precompiling", String(take!(iob)))
         Pkg.precompile(io=iob)