diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-03-04 13:58:38 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-03-04 15:22:59 +0100 |
| commit | bab9cc4aff09a14fdd4178c479becf932992b5b5 (patch) | |
| tree | a2ff7df506a8cc3914f4c06ca17163018764bd8c | |
| parent | c483c5c82c129b51ef6068fad3d3f0fbca1f5df1 (diff) | |
| download | patches-bab9cc4aff09a14fdd4178c479becf932992b5b5.tar patches-bab9cc4aff09a14fdd4178c479becf932992b5b5.tar.gz | |
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'.
| -rw-r--r-- | guix/scripts/environment.scm | 3 | ||||
| -rw-r--r-- | tests/guix-environment.sh | 10 |
2 files changed, 0 insertions, 13 deletions
diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm index 3966531efa..0cf7b3fd5e 100644 --- a/guix/scripts/environment.scm +++ b/guix/scripts/environment.scm @@ -220,9 +220,6 @@ COMMAND or an interactive shell in that environment.\n")) (alist-cons 'inherit-regexp (make-regexp* arg) result))) - (option '(#\E "exec") #t #f ; deprecated - (lambda (opt name arg result) - (alist-cons 'exec (list %default-shell "-c" arg) result))) (option '("search-paths") #f #f (lambda (opt name arg result) (alist-cons 'search-paths #t result))) 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 |