From 71977101218d1fd5d7f5016cbbcb8710be057d49 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Fri, 10 Dec 2021 12:26:29 +0100
Subject: shell: When using '-D -f', '-D' has no effect on remaining packages.

Fixes <https://issues.guix.gnu.org/52093>.
Reported by Konrad Hinsen <konrad.hinsen@fastmail.net>.

* guix/scripts/shell.scm (%options): In "--file" handler, add call to
'ensure-ad-hoc'.
* tests/guix-shell.sh: Add test.
---
 guix/scripts/shell.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'guix/scripts')

diff --git a/guix/scripts/shell.scm b/guix/scripts/shell.scm
index 7cd7ce78e1..546639818f 100644
--- a/guix/scripts/shell.scm
+++ b/guix/scripts/shell.scm
@@ -115,7 +115,7 @@ interactive shell in that environment.\n"))
               (option '(#\f "file") #t #f
                       (lambda (opt name arg result)
                         (alist-cons 'load (tag-package-arg result arg)
-                                    result)))
+                                    (ensure-ad-hoc result))))
               (option '(#\q) #f #f
                       (lambda (opt name arg result)
                         (alist-cons 'explicit-loading? #t result)))
-- 
cgit v1.2.3