[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#65229] [PATCH 2/2] ui: 'load*' accepts /dev/fd/N files pointing to
From: |
Ludovic Courtès |
Subject: |
[bug#65229] [PATCH 2/2] ui: 'load*' accepts /dev/fd/N files pointing to a pipe. |
Date: |
Fri, 11 Aug 2023 17:34:19 +0200 |
From: Ludovic Courtès <ludovic.courtes@inria.fr>
This allows users to write Bash commands like:
guix time-machine -C <(echo %default-channels) -- ...
or:
guix build -m <(echo '(specifications->manifest (list "guile"))')
Previously, on GNU/Linux, they would fail with:
error: failed to load '/dev/fd/63': No such file or directory
* guix/ui.scm (try-canonicalize-path): New procedure.
(load*): Use it.
* tests/guix-build.sh: Test 'guix build -m' with a /dev/fd/N file.
---
guix/ui.scm | 16 +++++++++++++++-
tests/guix-build.sh | 9 ++++++++-
2 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/guix/ui.scm b/guix/ui.scm
index 47a118364a..6f2d4fe245 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -200,6 +200,20 @@ (define-syntax-rule (without-compiler-optimizations exp)
(parameterize (((@ (system base compile) default-optimization-level) 1))
exp))
+(define (try-canonicalize-path file)
+ "Like 'canonicalize-path', but return FILE as-is if 'canonicalize-path'
+throws.
+
+This is necessary for corner cases where 'canonicalize-path' fails. One
+example is on Linux when a /dev/fd/N file denotes a pipe, represented as a
+symlink to a non-existent file like 'pipe:[1234]', as in this example:
+
+ sh -c 'stat $(readlink -f /dev/fd/1)' | cat"
+ (catch 'system-error
+ (lambda ()
+ (canonicalize-path file))
+ (const file)))
+
(define* (load* file user-module
#:key (on-error 'nothing-special))
"Load the user provided Scheme source code FILE."
@@ -230,7 +244,7 @@ (define* (load* file user-module
;; 'primitive-load', so that FILE is compiled, which then allows
;; us to provide better error reporting with source line
numbers.
(without-compiler-optimizations
- (load (canonicalize-path file))))
+ (load (try-canonicalize-path file))))
(const #f))))))
(lambda _
;; XXX: Errors are reported from the pre-unwind handler below, but
diff --git a/tests/guix-build.sh b/tests/guix-build.sh
index 317c58ac42..4eab0e38b6 100644
--- a/tests/guix-build.sh
+++ b/tests/guix-build.sh
@@ -1,5 +1,5 @@
# GNU Guix --- Functional package management for GNU
-# Copyright © 2012-2014, 2016-2022 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2012-2014, 2016-2023 Ludovic Courtès <ludo@gnu.org>
# Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
# Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
#
@@ -397,6 +397,13 @@ guix build -d -m "$module_dir/manifest.scm" \
rm "$module_dir"/*.scm
+if [ -n "$BASH_VERSION" ]
+then
+ # Check whether we can load from a /dev/fd/N denoting a pipe, using this
+ # handy Bash-specific construct.
+ guix build -m <(echo '(specifications->manifest (list "guile"))') -n
+fi
+
# Using 'GUIX_BUILD_OPTIONS'.
GUIX_BUILD_OPTIONS="--dry-run --no-grafts"
export GUIX_BUILD_OPTIONS
--
2.41.0
- [bug#65229] [PATCH 0/2] Add '-q' for 'pull' and 'time-machine'; support loading from pipes, Ludovic Courtès, 2023/08/11
- [bug#65229] [PATCH 1/2] pull, time-machine: Add '-q' to ignore channel files., Ludovic Courtès, 2023/08/11
- [bug#65229] [PATCH 1/2] pull, time-machine: Add '-q' to ignore channel files., Simon Tournier, 2023/08/16
- [bug#65229] [PATCH 1/2] pull, time-machine: Add '-q' to ignore channel files., Simon Tournier, 2023/08/16
- [bug#65229] [PATCH 1/2] pull, time-machine: Add '-q' to ignore channel files., Ludovic Courtès, 2023/08/17
- [bug#65229] [PATCH 1/2] pull, time-machine: Add '-q' to ignore channel files., Simon Tournier, 2023/08/17
- [bug#65229] [PATCH v2 1/2] ui: 'load*' accepts /dev/fd/N files pointing to a pipe., Ludovic Courtès, 2023/08/17
- [bug#65229] [PATCH v2 2/2] pull, time-machine: Add '-q' to ignore channel files., Ludovic Courtès, 2023/08/17
- [bug#65229] [PATCH v2 2/2] pull, time-machine: Add '-q' to ignore channel files., Simon Tournier, 2023/08/17
- bug#65229: [PATCH 0/2] Add '-q' for 'pull' and 'time-machine'; support loading from pipes, Ludovic Courtès, 2023/08/17
[bug#65229] [PATCH 2/2] ui: 'load*' accepts /dev/fd/N files pointing to a pipe.,
Ludovic Courtès <=