diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2021-03-13 14:01:38 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2021-03-15 17:18:39 -0700 |
| commit | db650186699ec82de2cfc9c2cbed1816b231cfec (patch) | |
| tree | 0a93e8f3c3fce0bf0939c2431d72be44bcc4780b /src/deployment.lisp | |
| parent | 79b0da1845e75f15fffe73b137cc643c469d1c56 (diff) | |
| download | consfigurator-db650186699ec82de2cfc9c2cbed1816b231cfec.tar.gz | |
attempt to implement revised propspecs spec
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Diffstat (limited to 'src/deployment.lisp')
| -rw-r--r-- | src/deployment.lisp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/deployment.lisp b/src/deployment.lisp index 91b46a8..4df5b59 100644 --- a/src/deployment.lisp +++ b/src/deployment.lisp @@ -33,7 +33,7 @@ connections in CONNECTIONS have been both normalised and preprocessed." (apply #'establish-connection type remaining args))) (if remaining (connect remaining) - (eval-propspec (host-propspec *host*))) + (propappapply (eval-propspec (host-propspec *host*)))) (connection-teardown *connection*))))) ;; make a partial own-copy of HOST so that connections can add new pieces ;; of required prerequisite data; specifically, so that they can request @@ -94,7 +94,7 @@ ADDITIONAL-PROPERTIES can override the host's usual static informational attributes, in the same way that later entries in the list of properties specified in DEFHOST forms can override earlier entries (see DEFHOST's docstring)." - `(deploy* ',connections ,host ,(props additional-properties))) + `(deploy* ',connections ,host (props eseqprops ,@additional-properties))) (defmacro deploy-these (connections host &body properties) "Like DEPLOY, except apply each of the properties specified by PROPERTIES, @@ -113,7 +113,7 @@ properties, plus any set by PROPERTIES. Static informational attributes set by PROPERTIES can override the host's usual static informational attributes, in the same way that later entries in the list of properties specified in DEFHOST forms can override earlier entries (see DEFHOST's docstring)." - `(deploy-these* ',connections ,host ,(props properties))) + `(deploy-these* ',connections ,host (props eseqprops ,@properties))) (defmacro defdeploy (name (connections host) &body additional-properties) "Define a function which does (DEPLOY CONNECTIONS HOST ADDITIONAL-PROPERTIES). |