diff options
| author | Yves Senn <yves.senn@gmail.com> | 2015-01-28 08:56:40 +0100 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2015-01-28 08:58:16 +0100 |
| commit | 71a84206ab4d3488ac0d522a7375efc67301aae5 (patch) | |
| tree | 9dea31850c699f74aa2c9f794f30a5f53c6dc7f2 /activesupport/lib | |
| parent | 36082a62048248c27cdd513c943ee94b716bd7f8 (diff) | |
| parent | b3c23f117695b3089c03b7c0d78781c176b2c418 (diff) | |
| download | rails-71a84206ab4d3488ac0d522a7375efc67301aae5.tar.gz rails-71a84206ab4d3488ac0d522a7375efc67301aae5.tar.bz2 rails-71a84206ab4d3488ac0d522a7375efc67301aae5.zip | |
Merge pull request #18709 from ianks/atomic-write
Return value of yielded block in File.atomic_write
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/file/atomic.rb | 5 |
1 files changed, 4 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 38374af388..fad6fa8d9d 100644 --- a/activesupport/lib/active_support/core_ext/file/atomic.rb +++ b/activesupport/lib/active_support/core_ext/file/atomic.rb @@ -20,7 +20,7 @@ class File temp_file = Tempfile.new(basename(file_name), temp_dir) temp_file.binmode - yield temp_file + return_val = yield temp_file temp_file.close if File.exist?(file_name) @@ -40,6 +40,9 @@ class File chown(old_stat.uid, old_stat.gid, file_name) # This operation will affect filesystem ACL's chmod(old_stat.mode, file_name) + + # Make sure we return the result of the yielded block + return_val rescue Errno::EPERM, Errno::EACCES # Changing file ownership failed, moving on. end |