aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2018-06-09 10:21:26 +0200
committerLudovic Courtès <ludo@gnu.org>2018-06-09 12:02:28 +0200
commit24cb66d18e37162721d636c277838718d3b23966 (patch)
treefe75c29f21fb9457cf42c50f5a7902aa89d34b1f
parent4554d4c8a925ed94ce846f927b43a65263acdd84 (diff)
downloadpatches-24cb66d18e37162721d636c277838718d3b23966.tar
patches-24cb66d18e37162721d636c277838718d3b23966.tar.gz
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.
-rw-r--r--guix/ui.scm11
1 files changed, 6 insertions, 5 deletions
diff --git a/guix/ui.scm b/guix/ui.scm
index 45f438fc45..99f66b0fdc 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)