aboutsummaryrefslogtreecommitdiff
path: root/src/deployment.lisp
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2021-03-19 18:48:37 -0700
committerSean Whitton <spwhitton@spwhitton.name>2021-03-19 19:07:10 -0700
commitac8af44a2b999e492d247f87262878edfc8c6b6b (patch)
tree829465fc8834a1cd66d3c8a0fab2f41210a2146b /src/deployment.lisp
parent1b6a8a54da3941fb22ade17836c7ab1608422450 (diff)
downloadconsfigurator-ac8af44a2b999e492d247f87262878edfc8c6b6b.tar.gz
%CONSFIGURE: don't prepend :LOCAL when a connection exists
This was breaking DEPLOYS, DEPLOYS-THESE in certain cases. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Diffstat (limited to 'src/deployment.lisp')
-rw-r--r--src/deployment.lisp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/deployment.lisp b/src/deployment.lisp
index 693afb9..5f93f33 100644
--- a/src/deployment.lisp
+++ b/src/deployment.lisp
@@ -40,7 +40,9 @@ preprocessed."
(apply-propspec (host-propspec *host*)))
(connection-teardown *connection*)))))
(let ((*host* (preprocess-host host)))
- (connect (if (eq :local (caar connections))
+ ;; prepend :LOCAL only if it's not already there and there is no
+ ;; connection already established
+ (connect (if (or *connection* (eq :local (caar connections)))
connections
(cons '(:local) connections))))))