nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

environment: Remove deprecated -E/--exec option. 

* guix/scripts/environment.scm (%options): Remove "--exec", which was
deprecated in commit 1de2fe95e0 in 2015.
* tests/guix-environment.sh: Remove use of '-E'.
This commit is contained in:
Ludovic Courtès 2019-03-04 13:58:38 +01:00
parent c483c5c82c
commit bab9cc4aff
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
guix/scripts/environment.scm
View File

@ -220,9 +220,6 @@ COMMAND or an interactive shell in that environment.\n"))
(alist-cons 'inherit-regexp (alist-cons 'inherit-regexp
(make-regexp* arg) (make-regexp* arg)
result))) 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 (option '("search-paths") #f #f
(lambda (opt name arg result) (lambda (opt name arg result)
(alist-cons 'search-paths #t result))) (alist-cons 'search-paths #t result)))

10
tests/guix-environment.sh
View File

@ -117,16 +117,6 @@ case "`uname -m`" in
;; ;;
esac 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 # 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. # in its profile (e.g., for 'gzip'), but we have to accept them.
guix environment guix --bootstrap -n guix environment guix --bootstrap -n