guix-commits
[Top][All Lists]
Advanced

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

branch master updated: guix: shell: Don't whitelist / by typo in `shell-


From: guix-commits
Subject: branch master updated: guix: shell: Don't whitelist / by typo in `shell-authorized-directories'.
Date: Fri, 08 Sep 2023 16:52:47 -0400

This is an automated email from the git hooks/post-receive script.

janneke pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 1ef4974be9 guix: shell: Don't whitelist / by typo in 
`shell-authorized-directories'.
1ef4974be9 is described below

commit 1ef4974be94d75d935d98399dcda44199a1fca47
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Wed Sep 6 10:52:17 2023 +0200

    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.
---
 guix/scripts/shell.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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)



reply via email to

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