Check for ObjectScript errors too

isc-etamarch · isc-etamarch · commit 45875dc990a0 · 2024-10-25T10:15:48.000-04:00
diff --git a/cls/SourceControl/Git/Utils.cls b/cls/SourceControl/Git/Utils.cls
@@ -626,7 +626,7 @@ ClassMethod Pull(remote As %String = "origin", pTerminateOnError As %Boolean=0)
     do errStream.OutputToDevice()
     write !, "Pull ran with return code: " _ returnCode
     set err = errStream.Read()
-    if ($find(err,"error") || $find(err, "fatal")) && pTerminateOnError {
+    if ($find(err,"error") || $find(err, "fatal") || $find(err, "ERROR")) && pTerminateOnError {
         quit $$$ERROR($$$GeneralError, err)
     }
     quit $$$OK

Original file line number	Diff line number	Diff line change
`@@ -626,7 +626,7 @@ ClassMethod Pull(remote As %String = "origin", pTerminateOnError As %Boolean=0)`
`626`	`626`	`do errStream.OutputToDevice()`
`627`	`627`	`write !, "Pull ran with return code: " _ returnCode`
`628`	`628`	`set err = errStream.Read()`
`629`		`- if ($find(err,"error") \|\| $find(err, "fatal")) && pTerminateOnError {`
	`629`	`+ if ($find(err,"error") \|\| $find(err, "fatal") \|\| $find(err, "ERROR")) && pTerminateOnError {`
`630`	`630`	`quit $$$ERROR($$$GeneralError, err)`
`631`	`631`	`}`
`632`	`632`	`quit $$$OK`