Skip to content

Commit

Permalink
Use WaitForComplete() for compatibility with old IRIS versions
Browse files Browse the repository at this point in the history
  • Loading branch information
isc-pbarton committed Jan 18, 2024
1 parent 947f1bb commit 35d6c83
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions cls/SourceControl/Git/Settings.cls
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ Method OnAfterConfigure() As %Boolean
// using work queue manager ensures proper OS user context when running ssh-keygen
set workMgr = $System.WorkMgr.%New("")
$$$ThrowOnError(workMgr.Queue("##class(SourceControl.Git.Utils).GenerateSSHKeyPair"))
$$$ThrowOnError(workMgr.Sync())
$$$ThrowOnError(workMgr.WaitForComplete())
set pubKeyName = ..privateKeyFile_".pub"
if ##class(%File).Exists(pubKeyName) {
set pubStream = ##class(%Stream.FileCharacter).%OpenId(pubKeyName,,.sc)
Expand Down Expand Up @@ -158,7 +158,7 @@ Method OnAfterConfigure() As %Boolean
// using work queue manager ensures proper OS user context/file ownership
set workMgr = $System.WorkMgr.%New("")
$$$ThrowOnError(workMgr.Queue("##class(SourceControl.Git.Utils).Init"))
$$$ThrowOnError(workMgr.Sync())
$$$ThrowOnError(workMgr.WaitForComplete())
do ##class(SourceControl.Git.Utils).EmptyInitialCommit()
} elseif (value = 2) {
set response = ##class(%Library.Prompt).GetString("Git remote URL (note: if authentication is required, use SSH, not HTTPS):",.remote,,,,defaultPromptFlag)
Expand All @@ -171,7 +171,7 @@ Method OnAfterConfigure() As %Boolean
// using work queue manager ensures proper OS user context/file ownership
set workMgr = $System.WorkMgr.%New("")
$$$ThrowOnError(workMgr.Queue("##class(SourceControl.Git.Utils).Clone",remote))
$$$ThrowOnError(workMgr.Sync())
$$$ThrowOnError(workMgr.WaitForComplete())
}
}
}
Expand Down

0 comments on commit 35d6c83

Please sign in to comment.