summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2022-06-16 16:53:36 +0200
committerLudovic Courtès <ludo@gnu.org>2022-06-16 23:57:40 +0200
commit4231031b69f141639ffd7056bfe7ddf60e7c534a (patch)
tree629cb1908ad0618e62f5dd758f1aa55083b981bd
parentc8e393ffe23529ab27225cd2e48eedc2c2c3d0ca (diff)
downloadguix-4231031b69f141639ffd7056bfe7ddf60e7c534a.tar.gz
shell: Do not auto-detect manifest when '-p' is used.
Previous, "guix shell -p /path/to/profile" would have manifest/guix.scm
auto-detection turned on.

* guix/scripts/shell.scm (auto-detect-manifest)[options-contain-payload?]:
Return #t for 'profile.
-rw-r--r--guix/scripts/shell.scm1
1 files changed, 1 insertions, 0 deletions
diff --git a/guix/scripts/shell.scm b/guix/scripts/shell.scm
index 1a6df98829..84776af2f3 100644
--- a/guix/scripts/shell.scm
+++ b/guix/scripts/shell.scm
@@ -256,6 +256,7 @@ Return the modified OPTS."
       ((('package . _) . _) #t)
       ((('load . _) . _) #t)
       ((('manifest . _) . _) #t)
+      ((('profile . _) . _) #t)
       ((('expression . _) . _) #t)
       ((_ . rest) (options-contain-payload? rest))))