summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authordanielsdeleo <dan@opscode.com>2012-12-18 10:55:30 -0800
committerdanielsdeleo <dan@opscode.com>2012-12-18 10:55:30 -0800
commit628c08810e26601d987cf2f90ea8593ca9063361 (patch)
tree8ade52712049e4c6de46827536f02492a1aac078 /lib
parentf519a92f4d2f2ec3052e0ba2af04442289f5b6b4 (diff)
downloadchef-628c08810e26601d987cf2f90ea8593ca9063361.tar.gz
explicitly include EnforceOwnershipAndPermissions where it's used
Diffstat (limited to 'lib')
-rw-r--r--lib/chef/provider.rb1
-rw-r--r--lib/chef/provider/cookbook_file.rb3
-rw-r--r--lib/chef/provider/directory.rb3
-rw-r--r--lib/chef/provider/file.rb1
-rw-r--r--lib/chef/provider/link.rb2
-rw-r--r--lib/chef/provider/remote_directory.rb2
-rw-r--r--lib/chef/provider/remote_file.rb2
-rw-r--r--lib/chef/provider/template.rb3
8 files changed, 15 insertions, 2 deletions
diff --git a/lib/chef/provider.rb b/lib/chef/provider.rb
index 3842f18f50..a7f60c0383 100644
--- a/lib/chef/provider.rb
+++ b/lib/chef/provider.rb
@@ -26,7 +26,6 @@ class Chef
class Provider
include Chef::DSL::Recipe
include Chef::Mixin::WhyRun
- include Chef::Mixin::EnforceOwnershipAndPermissions
attr_accessor :new_resource
attr_accessor :current_resource
diff --git a/lib/chef/provider/cookbook_file.rb b/lib/chef/provider/cookbook_file.rb
index 144afbddeb..c9e9f5fa56 100644
--- a/lib/chef/provider/cookbook_file.rb
+++ b/lib/chef/provider/cookbook_file.rb
@@ -23,6 +23,9 @@ require 'tempfile'
class Chef
class Provider
class CookbookFile < Chef::Provider::File
+
+ include Chef::Mixin::EnforceOwnershipAndPermissions
+
def whyrun_supported?
true
end
diff --git a/lib/chef/provider/directory.rb b/lib/chef/provider/directory.rb
index 0329aeb1ad..37dc03c9fb 100644
--- a/lib/chef/provider/directory.rb
+++ b/lib/chef/provider/directory.rb
@@ -26,6 +26,9 @@ require 'fileutils'
class Chef
class Provider
class Directory < Chef::Provider::File
+
+ include Chef::Mixin::EnforceOwnershipAndPermissions
+
def whyrun_supported?
true
end
diff --git a/lib/chef/provider/file.rb b/lib/chef/provider/file.rb
index 77f5217027..2928a36f5c 100644
--- a/lib/chef/provider/file.rb
+++ b/lib/chef/provider/file.rb
@@ -30,6 +30,7 @@ class Chef
class Provider
class File < Chef::Provider
+ include Chef::Mixin::EnforceOwnershipAndPermissions
include Chef::Mixin::Checksum
include Chef::Mixin::ShellOut
diff --git a/lib/chef/provider/link.rb b/lib/chef/provider/link.rb
index d6f333bd2f..b8017c4558 100644
--- a/lib/chef/provider/link.rb
+++ b/lib/chef/provider/link.rb
@@ -27,6 +27,8 @@ require 'chef/scan_access_control'
class Chef
class Provider
class Link < Chef::Provider
+
+ include Chef::Mixin::EnforceOwnershipAndPermissions
include Chef::Mixin::ShellOut
include Chef::Mixin::FileClass
diff --git a/lib/chef/provider/remote_directory.rb b/lib/chef/provider/remote_directory.rb
index 947f65fd3b..0412e8a668 100644
--- a/lib/chef/provider/remote_directory.rb
+++ b/lib/chef/provider/remote_directory.rb
@@ -30,6 +30,8 @@ require 'set'
class Chef
class Provider
class RemoteDirectory < Chef::Provider::Directory
+
+ include Chef::Mixin::EnforceOwnershipAndPermissions
include Chef::Mixin::FileClass
def action_create
diff --git a/lib/chef/provider/remote_file.rb b/lib/chef/provider/remote_file.rb
index 90e367f558..62db2cd7dd 100644
--- a/lib/chef/provider/remote_file.rb
+++ b/lib/chef/provider/remote_file.rb
@@ -26,6 +26,8 @@ class Chef
class Provider
class RemoteFile < Chef::Provider::File
+ include Chef::Mixin::EnforceOwnershipAndPermissions
+
def load_current_resource
@current_resource = Chef::Resource::RemoteFile.new(@new_resource.name)
super
diff --git a/lib/chef/provider/template.rb b/lib/chef/provider/template.rb
index 703b596d2b..4dcf23cb4e 100644
--- a/lib/chef/provider/template.rb
+++ b/lib/chef/provider/template.rb
@@ -28,6 +28,7 @@ class Chef
class Template < Chef::Provider::File
+ include Chef::Mixin::EnforceOwnershipAndPermissions
include Chef::Mixin::Checksum
include Chef::Mixin::Template
@@ -35,7 +36,7 @@ class Chef
@current_resource = Chef::Resource::Template.new(@new_resource.name)
super
end
-
+
def define_resource_requirements
super