ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-11 21:59:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

environment: '--check' does nothing when used with '--container'.

Browse source 
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.
This commit is contained in:
Ludovic Courtès 2022-01-25 14:36:06 +01:00
parent c0139a595b
commit b8743fef8a
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
guix/scripts/environment.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2015, 2018 David Thompson <davet@gnu.org> ;;; 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> ;;; Copyright © 2018 Mike Gerwitz <mtg@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -975,7 +975,10 @@ (define manifest
(mwhen (assoc-ref opts 'check?) (mwhen (assoc-ref opts 'check?)
(return (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 (cond
((assoc-ref opts 'search-paths) ((assoc-ref opts 'search-paths)