summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJay Mundrawala <jdmundrawala@gmail.com>2014-10-22 11:50:19 -0700
committerJay Mundrawala <jdmundrawala@gmail.com>2014-10-24 07:50:22 -0700
commitb9588e857b60bec1950bcd1ef2f2bb97f4fe60fd (patch)
tree56a8d6a610355905d40bd02896d530f1fdf5c4a9 /lib
parent5cae811a9684d2994c444cefd0e0c80e5db38247 (diff)
downloadchef-b9588e857b60bec1950bcd1ef2f2bb97f4fe60fd.tar.gz
Merge pull request #2281 from opscode/jdmundrawala/lcm-renamesjdmundrawala/11-lcm-renames
Renamed output_has_dsc_module_failure to dsc_module_import_failure
Diffstat (limited to 'lib')
-rw-r--r--lib/chef/util/dsc/local_configuration_manager.rb4
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/)