From: Hanage999 <hanage999@crazynewworld.net>
Date: Mon, 4 May 2020 11:51:34 +0000 (+0900)
Subject: Fix tootctl upgrade storage-schema failing to delete empty directories (#13593)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=ff72c0472f54e34bd69a0821198dbac68e8954ba;p=mastodon.git

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

diff --git a/lib/mastodon/upgrade_cli.rb b/lib/mastodon/upgrade_cli.rb
index 74d13f62d..779462a4f 100644
--- 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