Fix param propagation

Author: isc-dchui

preload/cls/IPM/Installer.cls

@@ -416,35 +416,4 @@ ClassMethod CreateTempDir() As %String
     return ##class(%File).NormalizeDirectory(tDir)
 }
 
-/// This method is called directly in LoadNewModule() instead of with an <Invoke> in the module.xml
-/// because the old mappings break load/install before any <Invokes> can be run.
-ClassMethod CleanupOldMappings() As %Status
-{
-    set sc = $$$OK
-    // Cleanup old mappings from oddStudioDocument
-    set key = ""
-    for {
-        set key = $order(^oddStudioDocument(key))
-        quit:key=""
-        if (key["%ZPM.PackageManager") || (key["%ZHSLIB.PackageManager") {
-            kill ^oddStudioDocument(key)
-        }
-    }
-
-    set status = ##class(%IPM.Utils.Module).RemoveGlobalMapping($namespace,"oddStudioDocument:(BEGIN):(""%ZP"")","IRISLIB")
-    if $$$ISERR(status) {
-        set sc = $$$ADDSC(sc, status)
-    }
-    set status = ##class(%IPM.Utils.Module).RemoveGlobalMapping($namespace,"oddStudioDocument:(""%ZP""):(""A"")","IRISSYS")
-    if $$$ISERR(status) {
-        set sc = $$$ADDSC(sc, status)
-    }
-    set status = ##class(%IPM.Utils.Module).RemoveGlobalMapping($namespace,"oddStudioDocument:(""Ens""):(""Ent"")","ENSLIB")
-    if $$$ISERR(status) {
-        set sc = $$$ADDSC(sc, status)
-    }
-
-    return sc
-}
-
 }

src/cls/IPM/Utils/Module.cls

@@ -274,17 +274,18 @@ ClassMethod LoadModuleFromDirectory(
         set tVerbose = $get(pParams("Verbose"))
         // LoadNewModule goes all the way through Reload->Validate->Compile->Activate, also compiling the new module.
         write:tVerbose !,"Loading from ",pDirectory,!
+
+        // Propagate all params to dependencies except those that should only apply to the top level module
         merge tParams = pParams
         if $get(pParams("Install")) || $get(pParams("Update")) {
             if $get(pParams("Update"),0) {
                 set tParams("cmd") = "update"
             } else {
                 zkill tParams("Install")
             }
-        } else {
-            // Propagate all params except developer mode to dependencies
-            set tParams("DeveloperMode") = $get(pOverrideDeveloperMode,0)
         }
+        set tParams("DeveloperMode") = $get(pOverrideDeveloperMode,0)
+
         set tSC = ..LoadNewModule(pDirectory,.tParams,pRepository,pLog)
         if $$$ISERR(tSC) {
             quit
@@ -1097,7 +1098,7 @@ ClassMethod LoadNewModule(
 
             // If installing new version of IPM, clean up old mappings
             if newModuleObj.Name=$$$IPMModuleName {
-                $$$ThrowOnError(##class(IPM.Installer).CleanupOldMappings())
+                $$$ThrowOnError(..CleanupOldMappings())
             }
         }
         if moduleCurrent '= "" {
@@ -1237,11 +1238,11 @@ ClassMethod LoadDependencies(
     set permitDowngrade = +$get(pParams("PermitDowngrade"))
     set ignoreInstalled = +$get(pParams("IgnoreInstalled"))
     write !, "Building dependency graph..." // Intentionally always write even in non-verbose mode
-    set sc = pModule.BuildDependencyGraph(.depdendencyGraph,,reloadSnapshots,,"",,,,ignoreInstalled,,permitDowngrade)
+    set sc = pModule.BuildDependencyGraph(.dependencyGraph,,reloadSnapshots,,"",,,,ignoreInstalled,,permitDowngrade)
     $$$ThrowOnError(sc)
     write "Done."
 
-    do ..ConstructInvertedDependencyGraph(.depdendencyGraph, .invertedDependencyGraph)
+    do ..ConstructInvertedDependencyGraph(.dependencyGraph, .invertedDependencyGraph)
     if isVerbose {
         write !, "Created inverted dependency graph from dependency graph"
     }
@@ -2417,4 +2418,35 @@ ClassMethod GetDeployedProjectName(moduleName As %String) As %String [ CodeMode
 moduleName_$$$DeployedProjectSuffix
 }
 
+/// This method is called directly in LoadNewModule() instead of with an <Invoke> in the module.xml
+/// because the old mappings break load/install before any <Invokes> can be run.
+ClassMethod CleanupOldMappings() As %Status
+{
+    set sc = $$$OK
+    // Cleanup old mappings from oddStudioDocument
+    set key = ""
+    for {
+        set key = $order(^oddStudioDocument(key))
+        quit:key=""
+        if (key["%ZPM.PackageManager") || (key["%ZHSLIB.PackageManager") {
+            kill ^oddStudioDocument(key)
+        }
+    }
+
+    set status = ##class(%IPM.Utils.Module).RemoveGlobalMapping($namespace,"oddStudioDocument:(BEGIN):(""%ZP"")","IRISLIB")
+    if $$$ISERR(status) {
+        set sc = $$$ADDSC(sc, status)
+    }
+    set status = ##class(%IPM.Utils.Module).RemoveGlobalMapping($namespace,"oddStudioDocument:(""%ZP""):(""A"")","IRISSYS")
+    if $$$ISERR(status) {
+        set sc = $$$ADDSC(sc, status)
+    }
+    set status = ##class(%IPM.Utils.Module).RemoveGlobalMapping($namespace,"oddStudioDocument:(""Ens""):(""Ent"")","ENSLIB")
+    if $$$ISERR(status) {
+        set sc = $$$ADDSC(sc, status)
+    }
+
+    return sc
+}
+
 }