diff options
author | Jay Mundrawala <jdmundrawala@gmail.com> | 2014-10-13 14:52:01 -0700 |
---|---|---|
committer | Jay Mundrawala <jdmundrawala@gmail.com> | 2014-10-13 14:52:01 -0700 |
commit | 24522cdb406e1de753e336b2036c02df9f611e85 (patch) | |
tree | beb205ebb20f70a6ca1558c80b5560fbcaca62e9 /lib | |
parent | e25fa19082888d0ab26fd1534c3d0ce0ca27bb9f (diff) | |
parent | 3aebce01e5585d527654d2ecd67ddcb3f48229b1 (diff) | |
download | chef-24522cdb406e1de753e336b2036c02df9f611e85.tar.gz |
Merge pull request #2218 from opscode/jdmundrawala/11-stable-issue-2169
Cherry-pick #2190 from opscode/jdmundrawala/issue-2169
Diffstat (limited to 'lib')
-rw-r--r-- | lib/chef/util/dsc/local_configuration_manager.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/chef/util/dsc/local_configuration_manager.rb b/lib/chef/util/dsc/local_configuration_manager.rb index 4a56b6a397..7395dd5bbf 100644 --- a/lib/chef/util/dsc/local_configuration_manager.rb +++ b/lib/chef/util/dsc/local_configuration_manager.rb @@ -29,7 +29,7 @@ class Chef::Util::DSC def test_configuration(configuration_document) status = run_configuration_cmdlet(configuration_document) - handle_what_if_exception!(status.stderr) unless status.succeeded? + log_what_if_exception(status.stderr) unless status.succeeded? configuration_update_required?(status.return_value) end @@ -78,14 +78,14 @@ $ProgressPreference = 'SilentlyContinue';start-dscconfiguration -path #{@configu EOH end - def handle_what_if_exception!(what_if_exception_output) + def log_what_if_exception(what_if_exception_output) if what_if_exception_output.gsub(/\s+/, ' ') =~ /A parameter cannot be found that matches parameter name 'Whatif'/i # LCM returns an error if any of the resources do not support the opptional What-If Chef::Log::warn("Received error while testing configuration due to resource not supporting 'WhatIf'") elsif output_has_dsc_module_failure?(what_if_exception_output) Chef::Log::warn("Received error while testing configuration due to a module for an imported resource possibly not being fully installed:\n#{what_if_exception_output.gsub(/\s+/, ' ')}") else - raise Chef::Exceptions::PowershellCmdletException, "Powershell Cmdlet failed: #{what_if_exception_output.gsub(/\s+/, ' ')}" + Chef::Log::warn("Received error while testing configuration:\n#{what_if_exception_output.gsub(/\s+/, ' ')}") end end |