fix: fix a bug where EnvFiles are not properly accessed in %IPM.Main

intersystems · Jan 16, 2025 · b84c7e8 · b84c7e8
1 parent 474e5ef
commit b84c7e8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/cls/IPM/Lifecycle/Base.cls b/src/cls/IPM/Lifecycle/Base.cls
@@ -517,7 +517,7 @@ Method %Reload(ByRef pParams) As %Status
 		If (tRoot = "") && tDeveloperMode {
 			Set tRoot = ..Module.Root
 		}
-		Do ..LoadInstallTimeConfig($Get(pParams("EnvFiles")))
+		Do ..LoadEnvironmentConfig($Get(pParams("EnvFiles")))
 
 		// For now, no-op if no root is configured.
 		Quit:tRoot=""
@@ -1791,7 +1791,7 @@ Query Packaging(pPackaging As %String = "") As %SQLQuery [ Final, SqlProc ]
 		and (:pPackaging is null or cp._default = :pPackaging)
 }
 
-ClassMethod LoadInstallTimeConfig(paths As %String)
+ClassMethod LoadEnvironmentConfig(paths As %String)
 {
 	#dim config As %IPM.General.EnvironmentConfig
 	Set config = ##class(%IPM.General.EnvironmentConfig).%Get()

diff --git a/src/cls/IPM/Main.cls b/src/cls/IPM/Main.cls
@@ -2210,7 +2210,7 @@ ClassMethod Uninstall(ByRef pCommandInfo) [ Internal ]
 
 ClassMethod RunOnePhase(ByRef pCommandInfo) [ Internal ]
 {
-	Do ##class(%IPM.Lifecycle.Base).LoadInstallTimeConfig($$$GetModifier(pCommandInfo,"env"))
+	Do ##class(%IPM.Lifecycle.Base).LoadEnvironmentConfig($Get(pCommandInfo("data", "EnvFiles")))
 	Set tModName = $Get(pCommandInfo("parameters","module"))
 	Set tPhases = $ListBuild($ZConvert(pCommandInfo, "w"))
 	Set tIsComplete = '$$$HasModifier(pCommandInfo,"only")
@@ -2287,7 +2287,7 @@ ClassMethod Unpublish(ByRef pCommandInfo) [ Internal ]
 
 ClassMethod ModuleAction(ByRef pCommandInfo) [ Internal ]
 {
-	Do ##class(%IPM.Lifecycle.Base).LoadInstallTimeConfig($$$GetModifier(pCommandInfo,"env"))
+	Do ##class(%IPM.Lifecycle.Base).LoadEnvironmentConfig($Get(pCommandInfo("data", "EnvFiles")))
 	Set tModName = $Get(pCommandInfo("parameters","module"))
 	Set tPhases = $ListFromString($Get(pCommandInfo("parameters","actions"))," ")
 	Set tIsComplete = '$$$HasModifier(pCommandInfo,"only")