guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: pull: Add missing monadic 'return'.


From: Ludovic Courtès
Subject: 01/01: pull: Add missing monadic 'return'.
Date: Wed, 7 Nov 2018 15:56:22 -0500 (EST)

civodul pushed a commit to branch master
in repository guix.

commit ea68b3f6527cf4a02c554cf3f6f446e30f4940f6
Author: Ludovic Courtès <address@hidden>
Date:   Wed Nov 7 21:53:44 2018 +0100

    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.
---
 guix/scripts/pull.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm
index aff4f37..dc83729 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."



reply via email to

[Prev in Thread] Current Thread [Next in Thread]