summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThom May <thom@chef.io>2015-05-05 17:51:41 +0100
committerThom May <thom@chef.io>2015-05-05 17:51:41 +0100
commitd52e13ea77589ba0209ba48454b78c60674a7e79 (patch)
treee45ee8b32c34b931c93c10c74904702c055fa659
parent25e05528231b32ed181f57c983d9a8161564571e (diff)
downloadchef-d52e13ea77589ba0209ba48454b78c60674a7e79.tar.gz
Fix indentation
-rw-r--r--lib/chef/file_access_control/unix.rb4
-rw-r--r--spec/support/shared/functional/securable_resource.rb30
2 files changed, 17 insertions, 17 deletions
diff --git a/lib/chef/file_access_control/unix.rb b/lib/chef/file_access_control/unix.rb
index 52265f8f7e..c53d832414 100644
--- a/lib/chef/file_access_control/unix.rb
+++ b/lib/chef/file_access_control/unix.rb
@@ -198,7 +198,7 @@ class Chef
Chef::Log.debug("found target_mode != current_mode, updating mode")
return true
elsif suid_bit_set? and (should_update_group? or should_update_owner?)
- return true
+ return true
else
Chef::Log.debug("found target_mode == current_mode, not updating mode")
# the user has specified a permission, but it matches the file, so behave idempotently
@@ -283,7 +283,7 @@ class Chef
end
def suid_bit_set?
- return target_mode & 04000 > 0
+ return target_mode & 04000 > 0
end
end
end
diff --git a/spec/support/shared/functional/securable_resource.rb b/spec/support/shared/functional/securable_resource.rb
index 2af6ef3a67..cd8c2a166b 100644
--- a/spec/support/shared/functional/securable_resource.rb
+++ b/spec/support/shared/functional/securable_resource.rb
@@ -233,21 +233,21 @@ shared_examples_for "a securable resource with existing target" do
end
describe "when setting the suid bit", :requires_root do
- before do
- @suid_mode = 04776
- resource.mode @suid_mode
- resource.run_action(:create)
- end
-
- it "should set the suid bit" do
- expect(File.lstat(path).mode & 007777).to eq(@suid_mode & 007777)
- end
-
- it "should retain the suid bit when updating the user" do
- resource.user 1338
- resource.run_action(:create)
- expect(File.lstat(path).mode & 007777).to eq(@suid_mode & 007777)
- end
+ before do
+ @suid_mode = 04776
+ resource.mode @suid_mode
+ resource.run_action(:create)
+ end
+
+ it "should set the suid bit" do
+ expect(File.lstat(path).mode & 007777).to eq(@suid_mode & 007777)
+ end
+
+ it "should retain the suid bit when updating the user" do
+ resource.user 1338
+ resource.run_action(:create)
+ expect(File.lstat(path).mode & 007777).to eq(@suid_mode & 007777)
+ end
end
end