summaryrefslogtreecommitdiff
path: root/lib/chef/provider
diff options
context:
space:
mode:
authorAdam Edwards <adamed@opscode.com>2014-10-10 11:35:37 -0700
committeradamedx <adamed@getchef.com>2014-10-14 13:29:46 +0100
commit949b5c79d142dfc03b312bb40106b4477b957df3 (patch)
treedd04e75926f6b477111b169bf7878d93ef074e0b /lib/chef/provider
parent87ebd29a5632d4a2598b12b99ecc9d2ee2b4586f (diff)
downloadchef-949b5c79d142dfc03b312bb40106b4477b957df3.tar.gz
DSC parameters should be passed even when there is no config data file
Diffstat (limited to 'lib/chef/provider')
-rw-r--r--lib/chef/provider/dsc_script.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/chef/provider/dsc_script.rb b/lib/chef/provider/dsc_script.rb
index b8ca54f1b8..1d83153cb4 100644
--- a/lib/chef/provider/dsc_script.rb
+++ b/lib/chef/provider/dsc_script.rb
@@ -98,9 +98,8 @@ class Chef
end
def get_augmented_configuration_flags(configuration_data_path)
- updated_flags = nil
+ updated_flags = @dsc_resource.flags.nil? ? {} : @dsc_resource.flags.dup
if configuration_data_path
- updated_flags = @dsc_resource.flags.nil? ? {} : @dsc_resource.flags.dup
Chef::Util::PathHelper.validate_path(configuration_data_path)
updated_flags[:configurationdata] = configuration_data_path
end