summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2018-11-07 21:53:44 +0100
committerLudovic Courtès <ludo@gnu.org>2018-11-07 21:56:16 +0100
commitea68b3f6527cf4a02c554cf3f6f446e30f4940f6 (patch)
tree8a125b9ca4e4f87c3e1b1570679245448f1e34ef
parent2b773a9273882b270306154223067a56e1e89e38 (diff)
downloadguix-ea68b3f6527cf4a02c554cf3f6f446e30f4940f6.tar.gz
pull: Add missing monadic 'return'.
Fixes a regression introduced in
5f7dd092ca577a534067f577b8849ed06cabf970 where, upon completion, 'guix
pull' would fail (instead of printing the new/upgraded packages) with
ugly errors like:

  successfully built /gnu/store/…-profile.drv
  1 package in profile
  Backtrace:
  […]
  In guix/store.scm:
    1605:24  1 (run-with-store _ _ #:guile-for-build _ #:system _ # _)
  In unknown file:
	     0 (_ #<build-daemon 256.97 2476b40>)

  ERROR: Wrong type to apply: #t

Reported by thorwil on #guix.

* guix/scripts/pull.scm (build-and-install): Add missing 'return' when
DRY-RUN? is wrong.
-rw-r--r--guix/scripts/pull.scm2
1 files changed, 1 insertions, 1 deletions
diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm
index aff4f378be..dc83729911 100644
--- a/guix/scripts/pull.scm
+++ b/guix/scripts/pull.scm
@@ -177,7 +177,7 @@ true, display what would be built without actually building it."
       (update-profile profile manifest
                       #:dry-run? dry-run?)
       (munless dry-run?
-        (display-profile-news profile)))))
+        (return (display-profile-news profile))))))
 
 (define (honor-lets-encrypt-certificates! store)
   "Tell Guile-Git to use the Let's Encrypt certificates."