diff options
| author | Adam Edwards <adamed@opscode.com> | 2014-09-02 14:09:34 -0700 |
|---|---|---|
| committer | adamedx <adamed@getchef.com> | 2014-09-10 20:29:00 -0700 |
| commit | 058b9a4cbf3883fb4b3bb3f1c8d3d7bf850176ba (patch) | |
| tree | 685cf90288effff966a0ec4bfe8985c9ffb59043 | |
| parent | 3810357b53f5ad0acd7fda8ab27aa6d6372a86c9 (diff) | |
| download | chef-058b9a4cbf3883fb4b3bb3f1c8d3d7bf850176ba.tar.gz | |
Explicitly require erroraction continue for predictability, consistency in match conditional
| -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 f41428081b..4a56b6a397 100644 --- a/lib/chef/util/dsc/local_configuration_manager.rb +++ b/lib/chef/util/dsc/local_configuration_manager.rb @@ -74,7 +74,7 @@ class Chef::Util::DSC def lcm_command_code(configuration_path, test_only_parameters) <<-EOH -$ProgressPreference = 'SilentlyContinue';start-dscconfiguration -path #{@configuration_path} -wait -force #{test_only_parameters} +$ProgressPreference = 'SilentlyContinue';start-dscconfiguration -path #{@configuration_path} -wait -erroraction 'continue' -force #{test_only_parameters} EOH end @@ -90,7 +90,7 @@ EOH end def output_has_dsc_module_failure?(what_if_output) - !! (what_if_output.match(/\sCimException/) && + !! (what_if_output =~ /\sCimException/ && what_if_output =~ /ProviderOperationExecutionFailure/ && what_if_output =~ /\smodule\s+is\s+installed/) end |