summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Edwards <adamed@opscode.com>2014-09-02 14:09:34 -0700
committerAdam Edwards <adamed@opscode.com>2014-09-02 14:09:34 -0700
commit08e45161fc63b7c95cf07afbfa17d41fac459c81 (patch)
tree528adf69f0549d4c0b76c15adab571990d751319
parentbf9657678844bfe1e2849f2dab9858c8bc0c4055 (diff)
downloadchef-08e45161fc63b7c95cf07afbfa17d41fac459c81.tar.gz
Explicitly require erroraction continue for predictability, consistency in match conditional
-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 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