diff options
| -rw-r--r-- | src/connection/fork.lisp | 4 | ||||
| -rw-r--r-- | src/connection/sbcl.lisp | 2 | ||||
| -rw-r--r-- | src/package.lisp | 2 | ||||
| -rw-r--r-- | src/util.lisp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/connection/fork.lisp b/src/connection/fork.lisp index ca269df..593d468 100644 --- a/src/connection/fork.lisp +++ b/src/connection/fork.lisp @@ -31,7 +31,7 @@ Must not start up any threads.")) `(continue-deploy* ,connection ',remaining)) (when-let ((lines (lines out))) (inform t lines)) - (return-exit + (exit-code-to-retval exit :on-failure (failed-change "~&Fork connection child failed; stderr was ~%~%~A" err)))) @@ -81,7 +81,7 @@ single-threaded context for the execution of POST-FORK.")) `(continue-deploy* ,connection ',remaining)) (when-let ((lines (lines out))) (inform t lines)) - (return-exit + (exit-code-to-retval exit :on-failure (failed-change "~&Reinvoked Lisp image failed; stderr was ~%~%~A" err)))) diff --git a/src/connection/sbcl.lisp b/src/connection/sbcl.lisp index 9d488ca..4fad603 100644 --- a/src/connection/sbcl.lisp +++ b/src/connection/sbcl.lisp @@ -66,7 +66,7 @@ recommended.")) (when-let ((lines (lines out))) (inform t " Output was:" :fresh-line nil) (with-indented-inform (inform t lines))) - (return-exit + (exit-code-to-retval exit ;; print FORMS not PROGRAM because latter might contain sudo passwords :on-failure diff --git a/src/package.lisp b/src/package.lisp index 7ff96b2..436bc54 100644 --- a/src/package.lisp +++ b/src/package.lisp @@ -137,7 +137,7 @@ #:string-to-filename #:filename-to-string - #:return-exit + #:exit-code-to-retval #:posix-login-environment #:define-error-retval-cfun diff --git a/src/util.lisp b/src/util.lisp index 3fa3e78..d123e8c 100644 --- a/src/util.lisp +++ b/src/util.lisp @@ -611,7 +611,7 @@ interactive debugger.")) (,failures 22) (t 23)))))) -(defmacro return-exit (exit &key on-failure) +(defmacro exit-code-to-retval (exit &key on-failure) `(values nil (case ,exit |