Merge pull request #10 from briantist/ModuleImportExistingBug

Fix module import existing bug #9
briantist · Jul 8, 2017 · ae8303a · ae8303a
2 parents 6297ee7 + 1fa0ef7
commit ae8303a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/Idempotion.psd1 b/Idempotion.psd1
diff --git a/Public/Convert-DscResourceToCommand.ps1 b/Public/Convert-DscResourceToCommand.ps1
@@ -251,7 +251,7 @@ param(
                         $ipmoParams[$paramName] = $PSBoundParameters[$paramName]
                     }
 
-                $newMod = New-Module @nmoParams -Verbose:$VerbosePreference
+                $newMod = New-Module @nmoParams -Verbose:$false
 
                 if ($AsCustomObject) { # Just return it directly if we opted for a custom object
                     $newMod
@@ -269,10 +269,15 @@ param(
                      If it shouldn't be imported, then we leave it removed and return it to the caller.
 
                     #>
-                    $newMod | Remove-Module -Force -Verbose:$VerbosePreference
+                    $newMod | Remove-Module -Force -Verbose:$false
 
                     if ($Import) { # PassThru will be in $ipmoParams so the module will be returned if needed
-                        $newMod | Import-Module @ipmoParams -Global -Verbose:$VerbosePreference
+                        if ($Force) {
+                            Remove-Module -Name $newMod.Name -Force -ErrorAction Ignore -Verbose:$VerbosePreference
+                        }
+                        if ($Force -or -not (Get-Module -Name $newMod.Name -ErrorAction Ignore)) {
+                            $newMod | Import-Module @ipmoParams -Global -Verbose:$VerbosePreference
+                        }
                     } else {
                         $newMod  # module is always returned if it's not imported
                     }