rename combinator UNAPPLY->UNAPPLIED and add new UNAPPLY macro

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

4 files changed, 11 insertions, 10 deletions

diff --git a/src/property/apache.lisp b/src/property/apache.lisp
index bced26c..757135e 100644
--- a/src/property/apache.lisp
+++ b/src/property/apache.lisp
@@ -145,5 +145,5 @@ restart Apache."
                  ,agree-tos ,htdocs ,domain ,@aliases)
        (reloaded))
      :unapply
-     (unapply (site-enabled ,domain))
-     (unapply (site-available ,domain ""))))
+     (unapplied (site-enabled ,domain))
+     (unapplied (site-available ,domain ""))))
diff --git a/src/property/cron.lisp b/src/property/cron.lisp
index 2b081dc..3a1343a 100644
--- a/src/property/cron.lisp
+++ b/src/property/cron.lisp
@@ -94,7 +94,7 @@ inconsistent situations.  For example, suppose you
 
 and then later
 
-    (hostdeploy-these foo.example.org (unapply (additional-property)).
+    (hostdeploy-these foo.example.org (unapplied (additional-property)).
 
 As neither CRON:RUNS-CONFIGURATOR nor IMAGE-DUMPED with no arguments was
 applied since ADDITIONAL-PROPERTY was unapplied, the executable invoked by the
@@ -110,7 +110,7 @@ of IMAGE-DUMPED."
     (nice-system-job
      "consfigurator" when "root"
      "${XDG_CACHE_HOME:-$HOME/.cache}/consfigurator/images/latest")
-    :unapply (unapply (system-job "consfigurator" when "" ""))))
+    :unapply (unapplied (system-job "consfigurator" when "" ""))))
 
 (defprop user-crontab :posix (env &rest jobs)
   "Set the contents of the current user's crontab.  ENV is like the ENV argument
diff --git a/src/property/libvirt.lisp b/src/property/libvirt.lisp
index e7e5009..967d76c 100644
--- a/src/property/libvirt.lisp
+++ b/src/property/libvirt.lisp
@@ -303,10 +303,11 @@ your preferred VM networking setup and corresponding DEPLOYS propapp."
        ,@(and autostart `((started ,host)))
        :unapply
        (destroyed ,host*)
-       (unapply (defined ,host*))
-       (unapply (with-flagfile ,flagfile
-                  (chroot:os-bootstrapped-for
-                   ,chroot-options ,chroot ,host ,additional-properties))))))
+       (unapplied (defined ,host*))
+       (unapplied
+        (with-flagfile ,flagfile
+          (chroot:os-bootstrapped-for
+           ,chroot-options ,chroot ,host ,additional-properties))))))
 
 (defproplist kvm-boots-chroot :lisp (options properties)
   "Like LIBVIRT:KVM-BOOTS-CHROOT-FOR but define a new host using PROPERTIES."
diff --git a/src/property/sbuild.lisp b/src/property/sbuild.lisp
index da3828e..d5b90eb 100644
--- a/src/property/sbuild.lisp
+++ b/src/property/sbuild.lisp
@@ -77,7 +77,7 @@ Example usage:
     (sbuild:usable-by \"spwhitton\")
     (schroot:overlays-in-tmpfs)
     (periodic:at-most :monthly \"sbuild sid schroot rebuilt\"
-      (unapply (sbuild:built. nil (os:debian-unstable :amd64))))
+      (unapplied (sbuild:built. nil (os:debian-unstable :amd64))))
     (sbuild:built. nil
       (os:debian-unstable :amd64)
       (sbuild:standard-debian-schroot)
@@ -183,7 +183,7 @@ EOF :mode #o755)
        ;; TODO We should kill any sessions still using the chroot before
        ;; destroying it (as suggested by sbuild-destroychroot(8)).
        :unapply
-       (unapply (chroot:os-bootstrapped-for ,chroot-options ,chroot ,host))
+       (unapplied (chroot:os-bootstrapped-for ,chroot-options ,chroot ,host))
        (file:does-not-exist ,conf))))
 
 ;; Here we combine Propellor's Sbuild.osDebianStandard and Sbuild.update.