diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2022-01-25 14:36:06 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2022-01-25 23:54:43 +0100 |
| commit | b8743fef8a44b09f4797d0834e0440cd1e5afaea (patch) | |
| tree | 7b7a284321bfa535dd9f6135238055cd51e834e6 | |
| parent | c0139a595b5b7354d56afa6186bad3b6447d808d (diff) | |
| download | guix-patches-b8743fef8a44b09f4797d0834e0440cd1e5afaea.tar guix-patches-b8743fef8a44b09f4797d0834e0440cd1e5afaea.tar.gz | |
environment: '--check' does nothing when used with '--container'.
Partly fixes <https://issues.guix.gnu.org/53355>.
Reported by Chris Marusich <cmmarusich@gmail.com>.
* guix/scripts/environment.scm (guix-environment*): Warn and do nothing
when both '--check' and '--container' are used.
| -rw-r--r-- | guix/scripts/environment.scm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm index 510cee727f..ec071402f4 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 <davet@gnu.org> -;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2015-2022 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2018 Mike Gerwitz <mtg@gnu.org> ;;; ;;; This file is part of GNU Guix. @@ -975,7 +975,10 @@ command-line option processing with 'parse-command-line'." (mwhen (assoc-ref opts 'check?) (return - (validate-child-shell-environment profile manifest))) + (if container? + (warning (G_ "'--check' is unnecessary \ +when using '--container'; doing nothing~%")) + (validate-child-shell-environment profile manifest)))) (cond ((assoc-ref opts 'search-paths) |