civodul pushed a commit to branch master
in repository guix.
commit cbac0b1db0d8a2e10438e319e9391f95355b2ebe
Author: Ludovic Courtès <l...@gnu.org>
AuthorDate: Sat May 25 12:01:16 2024 +0200
environment: Fix type error with ‘-C’ when ‘getpwuid’ fails.
Fixes a bug with ‘guix shell -C …’ in cases where ‘getpwuid’
returns #f (for example because nscd isn’t running) and
‘user’ is #f.
* guix/scripts/environment.scm (launch-environment/container): Use
‘name’ when building the ‘directory’ value, not ‘user’ since it can be #f.
Change-Id: I5da807d982a1edbb4122ac29b5a1e5fc4b0ce1b7
---
guix/scripts/environment.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm
index 1d7a6e198d..a219b2ac89 100644
--- a/guix/scripts/environment.scm
+++ b/guix/scripts/environment.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2015, 2018 David Thompson <da...@gnu.org>
-;;; Copyright © 2015-2023 Ludovic Courtès <l...@gnu.org>
+;;; Copyright © 2015-2024 Ludovic Courtès <l...@gnu.org>
;;; Copyright © 2018 Mike Gerwitz <m...@gnu.org>
;;; Copyright © 2022, 2023 John Kehayias <john.kehay...@protonmail.com>
;;;
@@ -812,7 +812,7 @@ WHILE-LIST."
(passwd:gecos pwd)))
(uid uid) (gid gid) (shell bash)
(directory (if (or user (not pwd))
- (string-append "/home/" user)
+ (string-append "/home/" name)
(passwd:dir pwd))))))
(groups (list (group-entry (name "users") (gid gid))
(group-entry (gid 65534) ;the overflow GID
