autonomic-cooperative/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix tootctl upgrade storage-schema failing to delete empty directories (#13593)

Browse Source
This commit is contained in:
Hanage999 2020-05-04 20:51:34 +09:00 committed by GitHub
parent 5cff7910c2
commit ff72c0472f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/mastodon/upgrade_cli.rb
View File

@ -121,7 +121,7 @@ module Mastodon
FileUtils.mv(previous_path, upgraded_path) FileUtils.mv(previous_path, upgraded_path)
begin begin
FileUtils.rmdir(previous_path, parents: true) FileUtils.rmdir(File.dirname(previous_path), parents: true)
rescue Errno::ENOTEMPTY rescue Errno::ENOTEMPTY
# OK # OK
end end
@ -131,7 +131,7 @@ module Mastodon
unless dry_run? unless dry_run?
begin begin
FileUtils.rmdir(upgraded_path, parents: true) FileUtils.rmdir(File.dirname(upgraded_path), parents: true)
rescue Errno::ENOTEMPTY rescue Errno::ENOTEMPTY
# OK # OK
end end