aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2021-07-26 14:20:18 -0700
committerSean Whitton <spwhitton@spwhitton.name>2021-08-22 11:28:07 -0700
commit823af9ff92b6c785185bbcb5e499be7ef6774bdb (patch)
tree3cc08e22e0bcc269b5cf05df18fce3bf3db018e8
parent1a6b284fa6c440cf813e7edd1123bd60b24bfdce (diff)
downloadconsfigurator-823af9ff92b6c785185bbcb5e499be7ef6774bdb.tar.gz
don't fail when stderr from POST-FORK grandchild process is empty
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
-rw-r--r--src/connection/fork.lisp3
-rw-r--r--src/package.lisp2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/connection/fork.lisp b/src/connection/fork.lisp
index 3737a78..015cfbe 100644
--- a/src/connection/fork.lisp
+++ b/src/connection/fork.lisp
@@ -28,7 +28,8 @@
(upload-all-prerequisite-data connection)
(eval-in-grandchild `(post-fork ,connection)
`(continue-deploy* ,connection ',remaining) (out err exit)
- (inform t (lines out))
+ (when-let ((lines (lines out)))
+ (inform t lines))
(return-exit
exit
:on-failure (failed-change
diff --git a/src/package.lisp b/src/package.lisp
index 5cde365..c172460 100644
--- a/src/package.lisp
+++ b/src/package.lisp
@@ -813,7 +813,7 @@
(:export #:shell-wrap-connection #:connection-shell-wrap))
(defpackage :consfigurator.connection.fork
- (:use #:cl #:consfigurator #:consfigurator.connection.local)
+ (:use #:cl #:alexandria #:consfigurator #:consfigurator.connection.local)
(:export #:fork-connection
#:post-fork
#:can-probably-fork))