aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-10-13 10:52:37 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-10-13 10:52:37 -0300
commit664a0fa9cf461e7cf3e56c4928eb3c7aa6fe08dd (patch)
tree74a542dbd367b36ac44704b6a7db6943f23ee719 /activesupport
parent997f1575f78bf6a2d12b8665a55807d51fe964df (diff)
parent4d59832f29b0f98f0c8c4cc228e6d5d00a5a8ffd (diff)
downloadrails-664a0fa9cf461e7cf3e56c4928eb3c7aa6fe08dd.tar.gz
rails-664a0fa9cf461e7cf3e56c4928eb3c7aa6fe08dd.tar.bz2
rails-664a0fa9cf461e7cf3e56c4928eb3c7aa6fe08dd.zip
Merge pull request #17230 from robertoz-01/master
atomic_write rescue also Errno::EACCES
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/core_ext/file/atomic.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/file/atomic.rb b/activesupport/lib/active_support/core_ext/file/atomic.rb
index 0e7e3ba378..38374af388 100644
--- a/activesupport/lib/active_support/core_ext/file/atomic.rb
+++ b/activesupport/lib/active_support/core_ext/file/atomic.rb
@@ -40,7 +40,7 @@ class File
chown(old_stat.uid, old_stat.gid, file_name)
# This operation will affect filesystem ACL's
chmod(old_stat.mode, file_name)
- rescue Errno::EPERM
+ rescue Errno::EPERM, Errno::EACCES
# Changing file ownership failed, moving on.
end
end