From 6b61e01f1548b3de4d10d7aafed9aea94bdde85e Mon Sep 17 00:00:00 2001
From: Steve McIntyre <steve@einval.com>
Date: Mon, 6 Dec 2021 23:50:22 +0000
Subject: [PATCH] Try to remove dirs when rolling back

---
 tools/make_disc_trees.pl | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/make_disc_trees.pl b/tools/make_disc_trees.pl
index ac9ca688..972706ec 100755
--- a/tools/make_disc_trees.pl
+++ b/tools/make_disc_trees.pl
@@ -1534,6 +1534,9 @@ sub add_packages {
                 unlink ("$dir/$file") || msg_ap(0, "Couldn't delete file $dir/$file\n");
                 msg_ap(0, "  Rollback: removed $dir/$file\n");
             }
+	    # Try to remove the directory; will silently fail if there
+	    # are still files there, which is OK.
+	    rmdir ($dir);
         } else {
             $total_blocks += add_Packages_entry($dir, $arch, $in_backports, $package_info);
             $total_blocks += add_md5_entry($dir, $arch, $in_backports, $package_info);