aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJason Penilla <[email protected]>2023-12-06 15:32:08 -0700
committerJason Penilla <[email protected]>2023-12-06 15:32:08 -0700
commitada77b3a3b3d1109d960b3f31121c9d0903874d5 (patch)
treeac4a453182d2dd412f9fc97886facfe1094dba17
parent6bafacfb14a67bb6c10fe9dd5bcc76e6b74b47e0 (diff)
downloadPaper-ada77b3a3b3d1109d960b3f31121c9d0903874d5.tar.gz
Paper-ada77b3a3b3d1109d960b3f31121c9d0903874d5.zip
Wait on stream redirect futures (update helper task)
-rw-r--r--build.gradle.kts6
1 files changed, 4 insertions, 2 deletions
diff --git a/build.gradle.kts b/build.gradle.kts
index 0b8b21a5fa..5d4dae473e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -207,9 +207,10 @@ abstract class RebasePatches : BaseTask() {
.redirectErrorStream(true)
.start()
- redirect(proc.inputStream, out)
+ val f = redirect(proc.inputStream, out)
val exit = proc.waitFor()
+ f.get()
if (exit != 0) {
val outStr = String(out.toByteArray())
@@ -251,8 +252,9 @@ abstract class RebasePatches : BaseTask() {
.redirectErrorStream(true)
.start()
- redirect(apply2.inputStream, System.out)
+ val f1 = redirect(apply2.inputStream, System.out)
apply2.waitFor()
+ f1.get()
logger.lifecycle(outStr)
logger.lifecycle("Patch failed at $failed; See Git output above.")