From bab9cc4aff09a14fdd4178c479becf932992b5b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 4 Mar 2019 13:58:38 +0100
Subject: environment: Remove deprecated -E/--exec option.

* guix/scripts/environment.scm (%options): Remove "--exec", which was
deprecated in commit 1de2fe95e017c42aacbaa34f5dab8d48249cc064 in 2015.
* tests/guix-environment.sh: Remove use of '-E'.
---
 tests/guix-environment.sh | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'tests/guix-environment.sh')

diff --git a/tests/guix-environment.sh b/tests/guix-environment.sh
index ccbe027c7b..d6df6234f6 100644
--- a/tests/guix-environment.sh
+++ b/tests/guix-environment.sh
@@ -117,16 +117,6 @@ case "`uname -m`" in
 	;;
 esac
 
-
-# Same as above, but with deprecated -E flag.
-if guix environment --bootstrap --ad-hoc guile-bootstrap --pure \
-        -E "guile -c '(exit 42)'"
-then
-    false
-else
-    test $? = 42
-fi
-
 # Make sure we can build the environment of 'guix'.  There may be collisions
 # in its profile (e.g., for 'gzip'), but we have to accept them.
 guix environment guix --bootstrap -n
-- 
cgit v1.2.3


From dca58219584c1163a9fbf88fccea885eb53bf2af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 4 Mar 2019 14:19:55 +0100
Subject: environment: Rename '--inherit' to '--preserve'.

Suggested by Eric Bavier and Ricardo Wurmus.

* guix/scripts/environment.scm (show-help, %options): Emit a deprecation
warning for "--inherit" and add -E/--preserve.
* tests/guix-environment.sh: Adjust accordingly.
* doc/guix.texi (Invoking guix environment): Update accordingly.
---
 tests/guix-environment.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests/guix-environment.sh')

diff --git a/tests/guix-environment.sh b/tests/guix-environment.sh
index d6df6234f6..7ea9c200de 100644
--- a/tests/guix-environment.sh
+++ b/tests/guix-environment.sh
@@ -49,13 +49,13 @@ test -x `sed -r 's/^export PATH="(.*)"/\1/' "$tmpdir/a"`/guile
 
 cmp "$tmpdir/a" "$tmpdir/b"
 
-# Check '--inherit'.
+# Check '--preserve'.
 GUIX_TEST_ABC=1
 GUIX_TEST_DEF=2
 GUIX_TEST_XYZ=3
 export GUIX_TEST_ABC GUIX_TEST_DEF GUIX_TEST_XYZ
 guix environment --bootstrap --ad-hoc guile-bootstrap --pure	\
-     --inherit='^GUIX_TEST_A' --inherit='^GUIX_TEST_D'		\
+     --preserve='^GUIX_TEST_A' --preserve='^GUIX_TEST_D'	\
      -- "$SHELL" -c set > "$tmpdir/a"
 grep '^PATH=' "$tmpdir/a"
 grep '^GUIX_TEST_ABC=' "$tmpdir/a"
-- 
cgit v1.2.3