diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2021-04-08 12:47:01 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2021-04-08 12:47:01 -0700 |
| commit | 56d5dfa83fd100c4f6c143785411a4fc0c247753 (patch) | |
| tree | 2e5f5bb46726a6ee4e53c820ed4d4becce713e2b | |
| parent | d79cd5a939f0f6eb82dbcbdba9ba2a8011436889 (diff) | |
| download | consfigurator-56d5dfa83fd100c4f6c143785411a4fc0c247753.tar.gz | |
:SBCL connection: output stdout even when remote Lisp failed
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| -rw-r--r-- | src/connection/sbcl.lisp | 9 | ||||
| -rw-r--r-- | src/package.lisp | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/connection/sbcl.lisp b/src/connection/sbcl.lisp index 0aed2c5..aefdb9d 100644 --- a/src/connection/sbcl.lisp +++ b/src/connection/sbcl.lisp @@ -43,12 +43,13 @@ recommended.")) "sbcl" "--noinform" "--noprint" "--disable-debugger" "--no-sysinit" "--no-user-init") - (inform t "done." :fresh-line nil) + (inform t (if (zerop exit) "done." "failed.") :fresh-line nil) + (when-let ((lines (lines out))) + (inform t " Output was:" :fresh-line nil) + (with-indented-inform (inform t lines))) (unless (zerop exit) ;; print FORMS not PROGRAM because latter might contain sudo passwords (failed-change "~&Remote Lisp failed; stderr was:~%~%~A~&~%Program we sent:~%~%~A" - err forms)) - (inform t " Output was:" :fresh-line nil) - (with-indented-inform (inform t (lines out))))) + err forms)))) nil) diff --git a/src/package.lisp b/src/package.lisp index 9315138..345f928 100644 --- a/src/package.lisp +++ b/src/package.lisp @@ -302,7 +302,7 @@ #:none-installed-p)) (defpackage :consfigurator.connection.sbcl - (:use #:cl #:consfigurator) + (:use #:cl #:alexandria #:consfigurator) (:local-nicknames (#:os #:consfigurator.property.os) (#:apt #:consfigurator.property.apt))) |