diff options
author | Lamont Granquist <lamont@scriptkiddie.org> | 2016-02-12 09:55:42 -0800 |
---|---|---|
committer | Lamont Granquist <lamont@scriptkiddie.org> | 2016-02-12 09:55:42 -0800 |
commit | b48b150cc50dbd54a719ea54a965de53d4531170 (patch) | |
tree | ca26e5887c259d6c2c1d6b9fc82247fefa8fe8c0 /lib/chef/property.rb | |
parent | 03eadde04eb219bfa8abe52d312261a5142e7266 (diff) | |
download | chef-b48b150cc50dbd54a719ea54a965de53d4531170.tar.gz |
convert MultilineOperationIndentation style to "indented"
this looks nicer.
Diffstat (limited to 'lib/chef/property.rb')
-rw-r--r-- | lib/chef/property.rb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/chef/property.rb b/lib/chef/property.rb index 8198dd6700..0230c8b23b 100644 --- a/lib/chef/property.rb +++ b/lib/chef/property.rb @@ -336,11 +336,11 @@ class Chef # It won't do what they expect. This checks whether you try to *read* # `content` while we are compiling the resource. if resource.respond_to?(:resource_initializing) && - resource.resource_initializing && - resource.respond_to?(:enclosing_provider) && - resource.enclosing_provider && - resource.enclosing_provider.new_resource && - resource.enclosing_provider.new_resource.respond_to?(name) + resource.resource_initializing && + resource.respond_to?(:enclosing_provider) && + resource.enclosing_provider && + resource.enclosing_provider.new_resource && + resource.enclosing_provider.new_resource.respond_to?(name) Chef::Log.warn("#{Chef::Log.caller_location}: property #{name} is declared in both #{resource} and #{resource.enclosing_provider}. Use new_resource.#{name} instead. At #{Chef::Log.caller_location}") end @@ -486,8 +486,8 @@ class Chef # the original options. options = self.options if modified_options.has_key?(:name_property) || - modified_options.has_key?(:name_attribute) || - modified_options.has_key?(:default) + modified_options.has_key?(:name_attribute) || + modified_options.has_key?(:default) options = options.reject { |k, v| k == :name_attribute || k == :name_property || k == :default } end self.class.new(options.merge(modified_options)) |