Skip to content
Snippets Groups Projects
Unverified Commit ff72c047 authored by Hanage999's avatar Hanage999 Committed by GitHub
Browse files

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

parent 5cff7910
No related branches found
No related tags found
No related merge requests found
......@@ -121,7 +121,7 @@ module Mastodon
FileUtils.mv(previous_path, upgraded_path)
begin
FileUtils.rmdir(previous_path, parents: true)
FileUtils.rmdir(File.dirname(previous_path), parents: true)
rescue Errno::ENOTEMPTY
# OK
end
......@@ -131,7 +131,7 @@ module Mastodon
unless dry_run?
begin
FileUtils.rmdir(upgraded_path, parents: true)
FileUtils.rmdir(File.dirname(upgraded_path), parents: true)
rescue Errno::ENOTEMPTY
# OK
end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment