pull: Add missing monadic 'return'.
authorLudovic Courtès <ludo@gnu.org>
Wed, 7 Nov 2018 20:53:44 +0000 (21:53 +0100)
committerLudovic Courtès <ludo@gnu.org>
Wed, 7 Nov 2018 20:56:16 +0000 (21:56 +0100)
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.

guix/scripts/pull.scm

index aff4f37..dc83729 100644 (file)
@@ -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."