:SBCL connection: propagate :NO-CHANGE

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>

2 files changed, 5 insertions, 9 deletions

diff --git a/src/connection/fork.lisp b/src/connection/fork.lisp
index 1d96501..ae25bca 100644
--- a/src/connection/fork.lisp
+++ b/src/connection/fork.lisp
@@ -66,11 +66,7 @@ for example, such that we don't see it."
         (-1
          (error "fork(2) failed"))
         (0
-         (handler-bind ((serious-condition
-                          (lambda (c)
-                            (trivial-backtrace:print-backtrace
-                             c :output *error-output*)
-                            (uiop:quit 2))))
+         (with-backtrace-and-exit-code-two
            ;; Capture child stdout in case *STANDARD-OUTPUT* has been rebound
            ;; to somewhere else in the parent, e.g. by APPLY-AND-PRINT.  The
            ;; parent can then send the contents of the file named by OUTPUT to
diff --git a/src/connection/sbcl.lisp b/src/connection/sbcl.lisp
index 770d408..820f82e 100644
--- a/src/connection/sbcl.lisp
+++ b/src/connection/sbcl.lisp
@@ -46,13 +46,13 @@ recommended."))
     (multiple-value-bind (program forms)
         (continue-deploy*-program remaining requirements)
       (multiple-value-bind (out err exit) (run :may-fail :input program *sbcl*)
-        (inform t (if (zerop exit) "done." "failed.") :fresh-line nil)
+        (inform t (if (< exit 2) "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)
+        (unless (< exit 2)
           ;; print FORMS not PROGRAM because latter might contain sudo passwords
           (failed-change
 	   "~&Remote Lisp failed; stderr was:~%~%~A~&~%Program we sent:~%~%~S"
-           err forms)))))
-  nil)
+           err forms))
+        (values nil (if (zerop exit) :no-change nil))))))