From 78b591b8c5e81ba4b572bd3645a495ebeca74d4b Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 6 Feb 2025 11:48:34 -0600 Subject: [PATCH] Fix ABORT directive protocol mismatch I waffled on whether the ABORT directive should print an output line count of 0, to keep it consistent with other no-args directives (e.g. INIT_THREADS) that do so. But as of the previous commit, the configurator was emitting a 0 while the launcher was expected no 0. This commits reconciles the behavior, removing the emission of 0. If we need arguments to ABORT in the future, we can update both the launcher and configurator simultaneously to accommodate that. This should fix the confusing "Ignoring 1 trailing output lines" message whenever application launch gets aborted. --- src/commonMain/kotlin/main.kt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/commonMain/kotlin/main.kt b/src/commonMain/kotlin/main.kt index 06c0a11..fc52bd3 100644 --- a/src/commonMain/kotlin/main.kt +++ b/src/commonMain/kotlin/main.kt @@ -602,10 +602,7 @@ private fun executeDirectives( lines.forEach { println(it) } } } - if (abort) { - println("ABORT") - println("0") - } + if (abort) println("ABORT") } // -- Helper functions --