diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2021-07-02 13:22:08 -0700 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2021-07-07 09:46:10 -0700 |
commit | 265d42c87376f7cf9b0da51856e509cee753e9ef (patch) | |
tree | 5237b87bde5e3ad2f5b0d680f5c6a016ba6333b2 /src/connection/sbcl.lisp | |
parent | a6e77d27756d046ade8af3b37844c6711b819879 (diff) | |
download | consfigurator-265d42c87376f7cf9b0da51856e509cee753e9ef.tar.gz |
:SBCL: fix looking for sbcl(1) already on PATH
The old :CHECK subroutine was meant to enable successfully applying
SBCL-AVAILABLE to arbitrary hosts where sbcl(1) is already on PATH, but that
does not work because the use of OS:ETYPECASE signals an error at :HOSTATTRS
time if *HOST*'s OS is not known to be a subtype of OS:DEBIANLIKE. So move
the check for sbcl(1) on PATH outside of any property application.
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Diffstat (limited to 'src/connection/sbcl.lisp')
-rw-r--r-- | src/connection/sbcl.lisp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/connection/sbcl.lisp b/src/connection/sbcl.lisp index 820f82e..fb7fb73 100644 --- a/src/connection/sbcl.lisp +++ b/src/connection/sbcl.lisp @@ -19,8 +19,6 @@ (named-readtables:in-readtable :consfigurator) (defproplist sbcl-available :posix () - (:check - (zerop (mrun :for-exit "command" "-v" "sbcl"))) (os:etypecase (debianlike (apt:installed "sbcl")))) @@ -34,7 +32,8 @@ Lisp. This can mean that prerequisite data gets extracted from encrypted stores and stored unencrypted under ~~/.cache, and as such is not recommended.")) - (ignoring-hostattrs (sbcl-available)) + (unless (zerop (mrun :for-exit "command" "-v" "sbcl")) + (ignoring-hostattrs (sbcl-available))) (let ((requirements (asdf-requirements-for-host-and-features (safe-read-from-string (run :input "(prin1 *features*)" *sbcl*) |