aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJanneke Nieuwenhuizen <janneke@gnu.org>2023-09-06 10:52:17 +0200
committerJanneke Nieuwenhuizen <janneke@gnu.org>2023-09-08 22:51:25 +0200
commit1ef4974be94d75d935d98399dcda44199a1fca47 (patch)
treee0f6a079d7c4b2def06bc560129e724fb84511d1
parent4dd33fc62899134606f36f92594cf160b972f685 (diff)
downloadguix-1ef4974be94d75d935d98399dcda44199a1fca47.tar
guix-1ef4974be94d75d935d98399dcda44199a1fca47.tar.gz
guix: shell: Don't whitelist / by typo in `shell-authorized-directories'.
Fixes <https://issues.guix.gnu.org/65832>. * guix/scripts/shell.scm (authorized-shell-directory?): After warning, continue LOOP to return valid query result for DIRECTORY.
-rw-r--r--guix/scripts/shell.scm4
1 files changed, 3 insertions, 1 deletions
diff --git a/guix/scripts/shell.scm b/guix/scripts/shell.scm
index d67152cef7..83888eee1d 100644
--- a/guix/scripts/shell.scm
+++ b/guix/scripts/shell.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2021-2023 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -232,7 +233,8 @@ a hash-prefixed comment, or a blank line."
(port-line port)
(port-column port))))
(warning loc (G_ "ignoring invalid file name: '~a'~%")
- line))))))))))
+ line)
+ (loop))))))))))
(const #f)))
(define (options-with-caching opts)