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

5 years ago · ff72c0472f
parent 5cff7910c2
commit ff72c0472f
1 changed files with 2 additions and 2 deletions
--- a/lib/mastodon/upgrade_cli.rb
+++ b/lib/mastodon/upgrade_cli.rb
@ -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