diff options
author | Jay Mundrawala <jdmundrawala@gmail.com> | 2014-10-22 10:32:15 -0700 |
---|---|---|
committer | Jay Mundrawala <jdmundrawala@gmail.com> | 2014-10-22 10:32:15 -0700 |
commit | b898936126cc914d23d50c931c48d69ddb49df92 (patch) | |
tree | 0b0ae019b987849698cc473bda5e335759ceb8cf /lib/chef/util/dsc | |
parent | 8c06a8c16f4e1dd124415514082359e3dcef6f89 (diff) | |
download | chef-b898936126cc914d23d50c931c48d69ddb49df92.tar.gz |
Renamed output_has_dsc_module_failure to dsc_module_import_failure
Diffstat (limited to 'lib/chef/util/dsc')
-rw-r--r-- | lib/chef/util/dsc/local_configuration_manager.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/util/dsc/local_configuration_manager.rb b/lib/chef/util/dsc/local_configuration_manager.rb index 7395dd5bbf..4d49c8dcff 100644 --- a/lib/chef/util/dsc/local_configuration_manager.rb +++ b/lib/chef/util/dsc/local_configuration_manager.rb @@ -82,14 +82,14 @@ EOH 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) + elsif dsc_module_import_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 Chef::Log::warn("Received error while testing configuration:\n#{what_if_exception_output.gsub(/\s+/, ' ')}") end end - def output_has_dsc_module_failure?(what_if_output) + def dsc_module_import_failure?(what_if_output) !! (what_if_output =~ /\sCimException/ && what_if_output =~ /ProviderOperationExecutionFailure/ && what_if_output =~ /\smodule\s+is\s+installed/) |