mirror of
https://github.com/discourse/discourse.git
synced 2026-09-05 04:40:41 -05:00
FIX: Can't upload backup.
* Regression introduced in https://github.com/discourse/discourse/commit/142571bba010eedbdfc1452d42beccc72389c373
This commit is contained in:
@@ -42,8 +42,11 @@ class HandleChunkUpload
|
||||
tmp_directory = @params[:tmp_directory]
|
||||
|
||||
# delete destination files
|
||||
File.delete(upload_path)
|
||||
File.delete(tmp_upload_path)
|
||||
begin
|
||||
File.delete(upload_path)
|
||||
File.delete(tmp_upload_path)
|
||||
rescue Errno::ENOENT
|
||||
end
|
||||
|
||||
# merge all the chunks
|
||||
File.open(tmp_upload_path, "a") do |file|
|
||||
@@ -59,7 +62,10 @@ class HandleChunkUpload
|
||||
FileUtils.mv(tmp_upload_path, upload_path, force: true)
|
||||
|
||||
# remove tmp directory
|
||||
FileUtils.rm_rf(tmp_directory)
|
||||
begin
|
||||
FileUtils.rm_rf(tmp_directory)
|
||||
rescue Errno::ENOENT
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user