diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-03-04 14:19:55 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-03-04 15:22:59 +0100 |
| commit | dca58219584c1163a9fbf88fccea885eb53bf2af (patch) | |
| tree | ba2d2992b2e638a8fb07c600c8a401a71ced001d /tests | |
| parent | bab9cc4aff09a14fdd4178c479becf932992b5b5 (diff) | |
| download | patches-dca58219584c1163a9fbf88fccea885eb53bf2af.tar patches-dca58219584c1163a9fbf88fccea885eb53bf2af.tar.gz | |
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.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/guix-environment.sh | 4 |
1 files changed, 2 insertions, 2 deletions
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" |