diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2022-10-13 15:52:43 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2022-10-13 15:56:56 +0200 |
| commit | 8b192c5550213911f930594f4fd7386f36618237 (patch) | |
| tree | ab0a0715f95d0db36e1d6ccba7aff4ab194188ce /gnu | |
| parent | 10d429f2fce321d8285684503094694ec3979865 (diff) | |
| download | guix-8b192c5550213911f930594f4fd7386f36618237.tar.gz guix-8b192c5550213911f930594f4fd7386f36618237.zip | |
shell: Handle '--emulate-fhs' in 'guix shell', not in 'guix environment'.
Previously, using 'guix shell -CF coreutils' twice (such that the
profile is cache) would result in:
guix shell: error: '--profile' cannot be used with package options
This patch fixes it by moving argument handling to (guix scripts shell),
before 'options-with-caching' is called.
* guix/scripts/environment.scm (show-environment-options-help)
(%options): Remove '--emulate-fhs'.
(guix-environment*): Pass OPTS as-is to 'options/resolve-packages'.
* guix/scripts/shell.scm (show-help, %options): Add '--emulate-fhs'.
Add the (expression . ...) component to RESULT right from the argument
handler.
* tests/guix-environment-container.sh: Change '--emulate-fhs' tests to
use 'guix shell' instead of 'guix environment'.
Diffstat (limited to 'gnu')
0 files changed, 0 insertions, 0 deletions