summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2020-05-06 17:26:25 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2020-05-06 17:26:25 -0700
commit4e973b1db3bc5b2e50bdcf90c72f6446ca448a2b (patch)
treee1c5633ceae56bbdb50589c3e09cae01f7ae03c2
parent1c2b0bf2c01dd8543efceb6384f41852a342c7b4 (diff)
downloadchef-4e973b1db3bc5b2e50bdcf90c72f6446ca448a2b.tar.gz
fix the scoping problems with file_content
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
-rw-r--r--lib/chef/provider/launchd.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/chef/provider/launchd.rb b/lib/chef/provider/launchd.rb
index 3be2f2995d..a79bfdb1e8 100644
--- a/lib/chef/provider/launchd.rb
+++ b/lib/chef/provider/launchd.rb
@@ -100,7 +100,7 @@ class Chef
file path do
name(path) if path
copy_properties_from(new_resource, :backup, :group, :mode, :owner)
- content(content) if content?
+ content(file_content) if file_content?
action(action)
only_if { manage_agent?(action) }
end
@@ -148,11 +148,11 @@ class Chef
end
end
- def content?
- !!content
+ def file_content?
+ !!file_content
end
- def content
+ def file_content
plist_hash = new_resource.plist_hash || gen_hash
::Plist::Emit.dump(plist_hash) unless plist_hash.nil?
end