[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.44-612-g90378d6

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit 2678a0a5c4a0c6b7122f1c48239eb1ef98cc04ea
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Thu May 31 16:05:44 2012 +0200

    p: work around #316521 dpkg: incomplete cleanup of empty directories
    
    add some common leftover directories to the ignore list
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/debian/changelog b/debian/changelog
index 0e3d27b..85de935 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,7 @@ piuparts (0.45) UNRELEASED; urgency=low
         management, logfiles, home directories, application data, and HACKS.
     - Add to ignored_files:
       + Default system logfiles as created by syslogd in /var/log/
+      + Common empty directories in /etc not removed due to dpkg bug #316521
   * piupartslib/packagesdb.py:
     - Do not consider a package as "untestable" if untestable/ contains a
       logfile from an obsolete version of that package.
diff --git a/piuparts.py b/piuparts.py
index 5436807..f76a053 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -243,6 +243,18 @@ class Settings:
             "/var/log/user.log",
             # home directories of system accounts
             "/var/lib/rbldns/",
+            # work around #316521 dpkg: incomplete cleanup of empty directories
+            "/etc/apache2/",
+            "/etc/apache2/conf.d/",
+            "/etc/cron.d/",
+            "/etc/nagios-plugins/config/",
+            "/etc/php5/",
+            "/etc/php5/conf.d/",
+            "/etc/php5/mods-available/",
+            "/etc/sgml/",
+            "/etc/ssl/",
+            "/etc/ssl/private/",
+            "/etc/xml/",
             # HACKS
             ]
         self.ignored_patterns = [

-- 
piuparts git repository