Merge pull request #465 from intersystems/fix-464

fix: install zpm 0.9+ in current namespace
intersystems · Apr 25, 2024 · 401589e · 401589e
2 parents 88220c8 + b2a93db
commit 401589e
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/%ZPM/PackageManager.cls b/src/%ZPM/PackageManager.cls
@@ -1543,10 +1543,6 @@ ClassMethod Install(ByRef pCommandInfo) [ Internal ]
 	}
   If (tModuleName = "") {
     Quit $$$OK
-  }
-  If (tModuleName = "zpm") {
-    New $Namespace
-    Set $Namespace="%SYS"
   }
 	If tRegistry = "" {
 		Set tServer = ##class(%ZPM.PackageManager.Client.RemoteServerDefinition).DeploymentServerOpen(1,,.tSC)
@@ -1601,6 +1597,11 @@ ClassMethod Install(ByRef pCommandInfo) [ Internal ]
           $$$ThrowStatus($$$ERROR($$$GeneralError, "Deployed package '" _ tModuleName _ "' " _ tResult.VersionString _ " not supported on this platform " _ platformVersion _ "."))
         }
       }
+			If (tModuleName = "zpm") && (tResult.VersionString < 0.9) {
+				// Pre-%IPM, install zpm in %SYS.
+				New $Namespace
+				Set $Namespace="%SYS"
+			}
 			$$$ThrowOnError(##class(%ZPM.PackageManager.Developer.Utils).LoadQualifiedReference(tResult, .tParams))
 		}
 	} Else {
@@ -2534,4 +2535,3 @@ ClassMethod DisplayModules(ByRef pList, pNumbered As %Boolean = 0, pWithNamespac
 }
 
 }
-