summaryrefslogtreecommitdiff
path: root/lib/fileutils.rb
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2019-03-11 09:52:31 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2019-03-11 09:52:31 +0000
commit7d3d8e79fe9cc9f21cd4341f0a6fb2e6306688fd (patch)
treeee3aedb02098ad49daccce891d5fff4206d5642d /lib/fileutils.rb
parentc2d3b8dfb43e6dbc0b9af3c0f880636ffcc06ca9 (diff)
fall back to copy + unlink on EPERM
[Feature #15415][ruby-core:90536] Co-authored-by: Eric Wong <normalperson@yhbt.net> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67212 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/fileutils.rb')
-rw-r--r--lib/fileutils.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/fileutils.rb b/lib/fileutils.rb
index 8981ef98e8..4e1c00dec9 100644
--- a/lib/fileutils.rb
+++ b/lib/fileutils.rb
@@ -527,7 +527,8 @@ module FileUtils
end
begin
File.rename s, d
- rescue Errno::EXDEV
+ rescue Errno::EXDEV,
+ Errno::EPERM # move from unencrypted to encrypted dir (ext4)
copy_entry s, d, true
if secure
remove_entry_secure s, force