diff options
| author | Jay Mundrawala <jdmundrawala@gmail.com> | 2014-12-15 21:34:41 -0800 |
|---|---|---|
| committer | Bryan McLellan <btm@loftninjas.org> | 2014-12-17 20:16:12 -0500 |
| commit | 60cf0de3e368168ba0a5ed8d9d4d9f261aed6431 (patch) | |
| tree | 37ce4b7ad49e4ef3916568b9b4ba8eafef15a486 /lib/chef/util/dsc/local_configuration_manager.rb | |
| parent | 1d5b9bf57df6812b6f6a2961d0995aa6c2d8f695 (diff) | |
| download | chef-60cf0de3e368168ba0a5ed8d9d4d9f261aed6431.tar.gz | |
Fix bug where error parser what-if output causes resource to be considered converged.
We now fall back to assuming the resource is not converged if we cannot parse
information about a dsc resource.
Diffstat (limited to 'lib/chef/util/dsc/local_configuration_manager.rb')
| -rw-r--r-- | lib/chef/util/dsc/local_configuration_manager.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/util/dsc/local_configuration_manager.rb b/lib/chef/util/dsc/local_configuration_manager.rb index f498a2bfea..55ffc7943c 100644 --- a/lib/chef/util/dsc/local_configuration_manager.rb +++ b/lib/chef/util/dsc/local_configuration_manager.rb @@ -103,7 +103,7 @@ EOH Chef::Log.debug("DSC: DSC returned the following '-whatif' output from test operation:\n#{what_if_output}") begin Parser::parse(what_if_output) - rescue Chef::Util::DSC::LocalConfigurationManager::Parser => e + rescue Chef::Exceptions::LCMParserException => e Chef::Log::warn("Could not parse LCM output: #{e}") [Chef::Util::DSC::ResourceInfo.new('Unknown DSC Resources', true, ['Unknown changes because LCM output was not parsable.'])] end |