Skip to content

Commit 5e58d3a

Browse files
committed
fix: ipm/zpm compatibility in package manager pull event handlers
1 parent ad8f961 commit 5e58d3a

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

cls/SourceControl/Git/PullEventHandler/PackageManager.cls

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ Parameter DESCRIPTION = "Does zpm ""load <repo root>""";
88
/// Subclasses may override to customize behavior on pull.
99
Method OnPull() As %Status
1010
{
11-
quit ##class(%ZPM.PackageManager).Shell("load "_..LocalRoot)
11+
set command = "load "_..LocalRoot
12+
quit $select(
13+
$$$comClassDefined("%IPM.Main"): ##class(%IPM.Main).Shell(command),
14+
1: ##class(%ZPM.PackageManager).Shell(command)
15+
)
1216
}
1317

14-
}
18+
}

cls/SourceControl/Git/PullEventHandler/PackageManagerReload.cls

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,18 @@ Method OnPull() As %Status
1313
$$$QuitOnError(sc)
1414
set context = ##class(SourceControl.Git.PackageManagerContext).ForInternalName(internalName)
1515
if $isobject(context.Package) {
16-
set sc = ##class(%ZPM.PackageManager).Shell("uninstall "_context.Package.Name)
16+
set command = "uninstall "_context.Package.Name
17+
set sc = $select(
18+
$$$comClassDefined("%IPM.Main"): ##class(%IPM.Main).Shell(command),
19+
1: ##class(%ZPM.PackageManager).Shell(command)
20+
)
1721
$$$QuitOnError(sc)
1822
}
19-
quit ##class(%ZPM.PackageManager).Shell("load "_..LocalRoot)
23+
set command = "load "_..LocalRoot
24+
quit $select(
25+
$$$comClassDefined("%IPM.Main"): ##class(%IPM.Main).Shell(command),
26+
1: ##class(%ZPM.PackageManager).Shell(command)
27+
)
2028
}
2129

2230
}

0 commit comments

Comments
 (0)