aboutsummaryrefslogtreecommitdiff
path: root/src/combinator.lisp
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2021-05-31 10:19:13 -0700
committerSean Whitton <spwhitton@spwhitton.name>2021-05-31 10:54:49 -0700
commitd8a1aabd2a4313b0f4760d1279705de809ab0d14 (patch)
tree56356bdad0602a5212d747df78225b72716c35df /src/combinator.lisp
parent521dd4f062ddbcffcfa7a8ef68966059ffbefc4c (diff)
downloadconsfigurator-d8a1aabd2a4313b0f4760d1279705de809ab0d14.tar.gz
APPLY-AND-PRINT: use a non-keyword rather than :FAILED-CHANGE
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Diffstat (limited to 'src/combinator.lisp')
-rw-r--r--src/combinator.lisp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/combinator.lisp b/src/combinator.lisp
index 892d9c8..6858790 100644
--- a/src/combinator.lisp
+++ b/src/combinator.lisp
@@ -104,8 +104,6 @@ apply the elements of REQUIREMENTS in reverse order."
(gather-results #'propappunapply
(reverse propapps))))))
-;; note that the :FAILED-CHANGE value is only used within this function and
-;; should not be returned by property subroutines, per the spec
(defun apply-and-print (propapps &optional unapply)
(let ((buffer (make-array '(0) :element-type 'character
:fill-pointer 0 :adjustable t))
@@ -135,7 +133,7 @@ apply the elements of REQUIREMENTS in reverse order."
(setq result (restart-case (if announce
(announce-propapp-apply propapp)
(propapp-apply propapp))
- (skip-property () :failed-change)))
+ (skip-property () 'failed-change)))
(when (and (plusp (length buffer))
(or (> *consfigurator-debug-level* 1)
(not (eql result :no-change))))
@@ -146,7 +144,7 @@ apply the elements of REQUIREMENTS in reverse order."
(get-hostname) (propappdesc propapp)
(case result
(:no-change "ok")
- (:failed-change "failed")
+ ('failed-change "failed")
(t "done"))))
(unless (eql result :no-change)
(setq return-value result)))))))