Skip to content

Commit ae3fb03

Browse files
committed
handle error with different print statement
1 parent 3cff66c commit ae3fb03

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

cls/SourceControl/Git/PullEventHandler/IncrementalLoad.cls

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,12 @@ Method OnPull() As %Status
1717
if ((internalName = "") && (..ModifiedFiles(i).changeType '= "D")) {
1818
write !, ..ModifiedFiles(i).externalName, " was not imported into the database and will not be compiled. "
1919
} elseif (..ModifiedFiles(i).changeType = "D") {
20-
$$$ThrowOnError(..DeleteFile(internalName))
21-
write !, ..ModifiedFiles(i).externalName, " was deleted."
20+
set sc = ..DeleteFile(internalName)
21+
if sc {
22+
write !, ..ModifiedFiles(i).externalName, " was deleted."
23+
} else {
24+
write !, "Deletion of ", ..ModifiedFiles(i).externalName, " failed."
25+
}
2226
} else {
2327
set compilelist(internalName) = ""
2428
set nFiles = nFiles + 1
@@ -38,13 +42,12 @@ Method DeleteFile(item As %String)
3842
{
3943
set type = ##class(SourceControl.Git.Utils).Type(item)
4044
if (type = "cls") {
41-
do $System.OBJ.Delete(item)
45+
quit $System.OBJ.Delete(item)
4246
} elseif (type = "csp") {
43-
do $System.CSP.DeletePage(item)
47+
quit $System.CSP.DeletePage(item)
4448
} else {
45-
do ##class(%Library.RoutineMgr).Delete(item)
49+
quit ##class(%Library.RoutineMgr).Delete(item)
4650
}
47-
Quit $$$OK
4851
}
4952

5053
}

0 commit comments

Comments
 (0)