github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-20 13:48:55 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Can't upload backup.

Browse Source 
* Regression introduced in 142571bba0
This commit is contained in:
Guo Xiang Tan 2018-04-06 10:14:17 +08:00
parent 5da7c2a4ad
commit e4a9242ada
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/services/handle_chunk_upload.rb
View File

@ -42,8 +42,11 @@ class HandleChunkUpload
tmp_directory = @params[:tmp_directory] tmp_directory = @params[:tmp_directory]
# delete destination files # delete destination files
File.delete(upload_path) begin
File.delete(tmp_upload_path) File.delete(upload_path)
File.delete(tmp_upload_path)
rescue Errno::ENOENT
end
# merge all the chunks # merge all the chunks
File.open(tmp_upload_path, "a") do |file| File.open(tmp_upload_path, "a") do |file|
@ -59,7 +62,10 @@ class HandleChunkUpload
FileUtils.mv(tmp_upload_path, upload_path, force: true) FileUtils.mv(tmp_upload_path, upload_path, force: true)
# remove tmp directory # remove tmp directory
FileUtils.rm_rf(tmp_directory) begin
FileUtils.rm_rf(tmp_directory)
rescue Errno::ENOENT
end
end end
end end