Ticket #39018: patch-src_remove.c.diff

src/remove.c

@@ -334 +334 @@
         push_leftover(&leftover, namenode);
         continue;
       }
-      if (errno != ENOTDIR) ohshite(_("cannot remove `%.250s'"),fnvb.buf);
+        if (errno != ENOTDIR) {
+            /* XXX Hack:
+             * dpkg includes /. in the packing list.
+             * rmdir("/.") will return EINVAL. dpkg will
+             * only attempt to remove /. when uninstalling
+             * the last package on the system, which is why
+             * Debian has never run into this issue. */
+            if (errno == EINVAL && strcmp(fnvb.buf, "/.") == 0)
+                continue;
+            else
+                ohshite(_("cannot remove `%.250s'"),fnvb.buf);
+        }
       debug(dbg_eachfiledetail, "removal_bulk unlinking '%s'", fnvb.buf);
       if (secure_unlink(fnvb.buf))
         ohshite(_("unable to securely remove '%.250s'"), fnvb.buf);
@@ -425 +436 @@
       push_leftover(&leftover, namenode);
       continue;
     }
-    if (errno != ENOTDIR) ohshite(_("cannot remove `%.250s'"),fnvb.buf);
+      if (errno != ENOTDIR) {
+          /* XXX Hack:
+           * dpkg includes /. in the packing list.
+           * rmdir("/.") will return EINVAL. dpkg will
+           * only attempt to remove /. when uninstalling
+           * the last package on the system, which is why
+           * Debian has never run into this issue. */
+          if (errno == EINVAL && strcmp(fnvb.buf, "/.") == 0)
+              continue;
+          else
+              ohshite(_("cannot remove `%.250s'"),fnvb.buf);
+      }
 
     if (lstat(fnvb.buf, &stab) == 0 && S_ISLNK(stab.st_mode)) {
       debug(dbg_eachfiledetail, "removal_bulk is a symlink to a directory");