Goswin, Lars,

I've had a look at your patches, and I didn't feel comfortable with the
idea of adding a generated list of parent directories.  I think it's
better to prevent that the forgotten directories become forgotten.  The
patch below does that.

Regards,

Bart Martens


diff -ru dpkg-1.13.11.1-1_orig/src/remove.c dpkg-1.13.11.1/src/remove.c
--- dpkg-1.13.11.1-1_orig/src/remove.c  2005-10-19 10:07:28.000000000 +0200
+++ dpkg-1.13.11.1/src/remove.c 2006-01-16 00:18:21.000000000 +0100
@@ -240,7 +240,10 @@
          * package which uses it.  Other files should only be listed
          * in this package (but we don't check).
          */
-        if (isdirectoryinuse(namenode,pkg)) continue;
+        if (isdirectoryinuse(namenode,pkg)) {
+          push_leftover(&leftover,namenode);
+          continue;
+        }
       }
       debug(dbg_eachfiledetail, "removal_bulk removing `%s'", fnvb.buf);
       if (!rmdir(fnvb.buf) || errno == ENOENT || errno == ELOOP) continue;
@@ -348,7 +351,10 @@
        * package which uses it.  Other files should only be listed
        * in this package (but we don't check).
        */
-      if (isdirectoryinuse(namenode,pkg)) continue;
+      if (isdirectoryinuse(namenode,pkg)) {
+        push_leftover(&leftover,namenode);
+        continue;
+      }
     }
 
     debug(dbg_eachfiledetail, "removal_bulk removing `%s'", fnvb.buf);



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to