Deal with LCM failing when a resource does not support WhatIf

1 files changed, 11 insertions, 7 deletions

diff --git a/lib/chef/util/powershell/cmdlet.rb b/lib/chef/util/powershell/cmdlet.rb
index 71bd876e40..f99812dc24 100644
--- a/lib/chef/util/powershell/cmdlet.rb
+++ b/lib/chef/util/powershell/cmdlet.rb
@@ -25,7 +25,7 @@ class Chef::Util::Powershell
     def initialize(node, cmdlet, output_format=nil, output_format_options={})
       @output_format = output_format
       @node = node
-      
+
       case output_format
       when nil
         @json_format = false
@@ -55,7 +55,7 @@ class Chef::Util::Powershell
       if @json_format && @output_format_options.has_key?(:depth)
         json_depth = @output_format_options[:depth]
       end
-      
+
       json_command = @json_format ? " | convertto-json -compress -depth #{json_depth}" : ""
       command_string = "powershell.exe -executionpolicy bypass -noprofile -noninteractive -command \"trap [Exception] {write-error -exception ($_.Exception.Message);exit 1};#{@cmdlet} #{switches_string} #{arguments_string}#{json_command}\";if ( ! $? ) { exit 1 }"
 
@@ -65,13 +65,17 @@ class Chef::Util::Powershell
       os_architecture = "#{ENV['PROCESSOR_ARCHITEW6432']}" == 'AMD64' ? :x86_64 : :i386
 
       status = nil
-      
+
       with_os_architecture(@node) do
-        status = command.run_command      
+        status = command.run_command
       end
-      
-      result = CmdletResult.new(status, @output_format)
-      
+
+      CmdletResult.new(status, @output_format)
+    end
+
+    def run!(switches={}, execution_options={}, *arguments)
+      result = run(switches, execution_options, arguments)
+
       if ! result.succeeded?
         raise Chef::Exceptions::PowershellCmdletException, "Powershell Cmdlet failed: #{result.stderr}"
       end