13
0
geforkt von Mirrors/Paper

Wait on stream redirect futures (update helper task)

Dieser Commit ist enthalten in:
Jason Penilla 2023-12-06 15:32:08 -07:00
Ursprung 7bd24cf0a9
Commit 813a64fcc8

Datei anzeigen

@ -207,9 +207,10 @@ abstract class RebasePatches : BaseTask() {
.redirectErrorStream(true) .redirectErrorStream(true)
.start() .start()
redirect(proc.inputStream, out) val f = redirect(proc.inputStream, out)
val exit = proc.waitFor() val exit = proc.waitFor()
f.get()
if (exit != 0) { if (exit != 0) {
val outStr = String(out.toByteArray()) val outStr = String(out.toByteArray())
@ -251,8 +252,9 @@ abstract class RebasePatches : BaseTask() {
.redirectErrorStream(true) .redirectErrorStream(true)
.start() .start()
redirect(apply2.inputStream, System.out) val f1 = redirect(apply2.inputStream, System.out)
apply2.waitFor() apply2.waitFor()
f1.get()
logger.lifecycle(outStr) logger.lifecycle(outStr)
logger.lifecycle("Patch failed at $failed; See Git output above.") logger.lifecycle("Patch failed at $failed; See Git output above.")