guix-commits
[Top][All Lists]
Advanced

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

05/10: ui: Avoid #:select'ing bindings introduced in the latest (guix bu


From: Ludovic Courtès
Subject: 05/10: ui: Avoid #:select'ing bindings introduced in the latest (guix build utils).
Date: Sat, 9 Jun 2018 06:02:38 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit 24cb66d18e37162721d636c277838718d3b23966
Author: Ludovic Courtès <address@hidden>
Date:   Sat Jun 9 10:21:26 2018 +0200

    ui: Avoid #:select'ing bindings introduced in the latest (guix build utils).
    
    This should allow 'guix pull' to complete even when invoked from a Guix
    that predates commit 5d669883ecc104403c5d3ba7d172e9c02234577c.
    
    * guix/ui.scm: Use #:hide instead of #:select.  This is a followup to
    5d669883ecc104403c5d3ba7d172e9c02234577c.
---
 guix/ui.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/guix/ui.scm b/guix/ui.scm
index 45f438f..99f66b0 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -42,11 +42,12 @@
   #:use-module ((guix build syscalls)
                 #:select (free-disk-space terminal-columns))
   #:use-module ((guix build utils)
-                #:select (invoke-error? invoke-error-program
-                                        invoke-error-arguments
-                                        invoke-error-exit-status
-                                        invoke-error-term-signal
-                                        invoke-error-stop-signal))
+                ;; XXX: All we need are the bindings related to
+                ;; '&invoke-error'.  However, to work around the bug described
+                ;; in 5d669883ecc104403c5d3ba7d172e9c02234577c, #:hide
+                ;; unwanted bindings instead of #:select'ing the needed
+                ;; bindings.
+                #:hide (package-name->name+version))
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-11)
   #:use-module (srfi srfi-19)



reply via email to

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