Merge branch 'master' into core-updates

 Conflicts:
	gnu/local.mk
	gnu/packages/bioinformatics.scm
	gnu/packages/django.scm
	gnu/packages/gtk.scm
	gnu/packages/llvm.scm
	gnu/packages/python-web.scm
	gnu/packages/python.scm
	gnu/packages/tex.scm
	guix/build-system/asdf.scm
	guix/build/emacs-build-system.scm
	guix/profiles.scm

1 files changed, 12 insertions, 6 deletions

diff --git a/guix/status.scm b/guix/status.scm
index 362ae2882c..1164c2a6e3 100644
--- a/guix/status.scm
+++ b/guix/status.scm
@@ -379,6 +379,8 @@ the current build phase."
      (G_ "building GHC package cache..."))
     ('ca-certificate-bundle
      (G_ "building CA certificate bundle..."))
+    ('emacs-subdirs
+     (G_ "listing Emacs sub-directories..."))
     ('glib-schemas
      (G_ "generating GLib schema cache..."))
     ('gtk-icon-themes
@@ -552,12 +554,16 @@ substitutes being downloaded."
                                        (download-start download)
                                        #:transferred transferred))))))
     (('substituter-succeeded item _ ...)
-     ;; If there are no jobs running, we already reported download completion
-     ;; so there's nothing left to do.
-     (unless (and (zero? (simultaneous-jobs status))
-                  (extended-build-trace-supported?))
-       (format port (success (G_ "substitution of ~a complete")) item)
-       (newline port)))
+     (when (extended-build-trace-supported?)
+       ;; If there are no jobs running, we already reported download completion
+       ;; so there's nothing left to do.
+       (unless (zero? (simultaneous-jobs status))
+         (format port (success (G_ "substitution of ~a complete")) item))
+
+       (when (and print-urls? (zero? (simultaneous-jobs status)))
+         ;; Leave a blank line after the "downloading ..." line and the
+         ;; progress bar (that's three lines in total).
+         (newline port))))
     (('substituter-failed item _ ...)
      (format port (failure (G_ "substitution of ~a failed")) item)
      (newline port))