[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/08: environment: '--check' does nothing when used with '--container'.
From: |
guix-commits |
Subject: |
01/08: environment: '--check' does nothing when used with '--container'. |
Date: |
Tue, 25 Jan 2022 17:56:47 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit b8743fef8a44b09f4797d0834e0440cd1e5afaea
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Tue Jan 25 14:36:06 2022 +0100
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.
---
guix/scripts/environment.scm | 7 +++++--
1 file 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)
- branch master updated (c0139a595b -> ebac201995), guix-commits, 2022/01/25
- 01/08: environment: '--check' does nothing when used with '--container'.,
guix-commits <=
- 04/08: gnu: Add python-pyvo., guix-commits, 2022/01/25
- 03/08: doc: Document 'invoke' & co., guix-commits, 2022/01/25
- 02/08: build: Require Guile >= 3.0.3., guix-commits, 2022/01/25
- 07/08: gnu: Add python-photutils., guix-commits, 2022/01/25
- 05/08: gnu: Add python-astroquery., guix-commits, 2022/01/25
- 08/08: gnu: Add python-regions., guix-commits, 2022/01/25
- 06/08: gnu: Add python-astropy-healpix., guix-commits, 2022/01/25