erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-26 00:17:11 -07:00
Code Releases Activity

Android commands return 0 even when they fail.

Browse source 
Use the error stream to determine if the call failed instead.
This commit is contained in:
Cedric Beust 2015-11-21 02:51:02 -08:00
parent 9e87f2625f
commit af4c7d9822
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/main/kotlin/com/beust/kobalt/misc/RunCommand.kt
View file

@ -35,11 +35,12 @@ open class RunCommand(val command: String) {
} }
} }
val callSucceeded = process.waitFor(30, TimeUnit.SECONDS) val callSucceeded = process.waitFor(30, TimeUnit.SECONDS)
val hasErrors = process.errorStream.available() > 0
// val callSucceeded = if (passed == 0) true else false // val callSucceeded = if (passed == 0) true else false
if (callSucceeded) { if (callSucceeded && ! hasErrors) {
successCallback(fromStream(process.inputStream)) successCallback(fromStream(process.inputStream))
} else { } else {
val stream = if (process.errorStream.available() > 0) process.errorStream val stream = if (hasErrors) process.errorStream
else if (process.inputStream.available() > 0) process.inputStream else if (process.inputStream.available() > 0) process.inputStream
else null else null
val errorString = val errorString =