From 56bc5a2c24b0fe56c72ced9a5ac85d982d592567 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Mon, 5 Jul 2021 16:29:46 -0700 Subject: signal SKIPPED-PROPERTIES & factor out interpreting exit codes Unconditionally signalling FAILED-CHANGE does not make sense because perhaps the type of condition C is not a subtype of SIMPLE-CONDITION. Moreover, when we invoke the SKIP-PROPERTY restart we do not actually pass the condition. For simplicity, and since all we need is notification that a SKIP-PROPERTY restart was invoked, instead define and signal a special-purpose condition. Additionally, use an exit code to pass the signal between Lisp images. Signed-off-by: Sean Whitton --- src/util.lisp | 55 ++++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 48 insertions(+), 7 deletions(-) (limited to 'src/util.lisp') diff --git a/src/util.lisp b/src/util.lisp index 24ec85e..7dadfe9 100644 --- a/src/util.lisp +++ b/src/util.lisp @@ -453,13 +453,54 @@ of this macro." Should be called soon after fork(2) in child processes." (signal 'in-child-process)) -(defmacro with-backtrace-and-exit-code-two (&body forms) - `(handler-bind - ((serious-condition - (lambda (c) - (trivial-backtrace:print-backtrace c :output *error-output*) - (uiop:quit 2)))) - ,@forms)) +(define-condition skipped-properties () () + (:documentation + "There were failed changes, but instead of aborting, that particular property +application was instead skipped over, either due to the semantics of a +property combinator, or because the user elected to skip the property in the +interactive debugger.")) + +(defmacro with-deployment-report (&rest forms) + (with-gensyms (failures) + `(let* (,failures + (result (handler-bind ((skipped-properties (lambda (c) + (declare (ignore c)) + (setq ,failures t)))) + ,@forms))) + (inform + t + (cond + ((eql :no-change result) + "No changes were made.") + (,failures + "There were failures while attempting to apply some properties.") + (t + "Changes were made without any reported failures.")))))) + +(defmacro with-backtrace-and-exit-code (&body forms) + (with-gensyms (failures) + `(let* (,failures + (result (handler-bind ((serious-condition + (lambda (c) + (trivial-backtrace:print-backtrace + c :output *error-output*) + (uiop:quit 3))) + (skipped-properties (lambda (c) + (declare (ignore c)) + (setq ,failures t)))) + ,@forms))) + (uiop:quit (cond ((eql :no-change result) 0) + (,failures 2) + (t 1)))))) + +(defmacro return-exit (exit &key on-failure) + `(values + nil + (case ,exit + (0 :no-change) + (1 nil) + (2 (signal 'skipped-properties) nil) + (t ,on-failure)))) (defun posix-login-environment (logname home) "Reset the environment after switching UID, or similar, in a :LISP connection. -- cgit v1.2.3