[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 5247686ab455c32c71d111f4d2e6db773be67997
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Thu May 31 13:57:53 2012 +0200

    p: remove cruft from ignore lists
    
    most of this looks like some HACKS or workarounds and is not
    needed for squeeze or later
    some data directories can be purged by proper preseeding
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/debian/changelog b/debian/changelog
index 8e915f1..e6b6fc6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,8 @@ piuparts (0.45) UNRELEASED; urgency=low
     - Report leftover directories with a trailing slash.
     - Allow ignore entries to specifically match directories.
     - Ignore patterns need to match the full filename, not a substring.
+    - Cleanup and regroup ignore lists.
+      + Remove many obsolete entries not needed for squeeze or later.
   * 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 065c6cc..30e153e 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -165,33 +165,20 @@ class Settings:
         self.warn_on_others = False
         self.warn_on_leftovers_after_purge = False
         self.ignored_files = [
-            "/dev/MAKEDEV",
             "/etc/aliases",
-            "/etc/apt/apt.conf",
             "/etc/apt/secring.gpg",
             "/etc/apt/trustdb.gpg",
             "/etc/apt/trusted.gpg",
             "/etc/apt/trusted.gpg~",
-            "/etc/blkid.tab",
             "/etc/crypttab",
-            "/etc/exports",
             "/etc/group",
             "/etc/group-",
             "/etc/gshadow",
             "/etc/gshadow-",
-            "/etc/hosts.allow.bak",
             "/etc/inetd.conf",
-            "/etc/init.d/gnocatan-meta-server",
             "/etc/inittab",
-            "/etc/inputrc",
-            "/etc/keys",
             "/etc/ld.so.cache",
-            "/etc/ld.so.conf",
-            "/etc/ld.so.conf.old",
             "/etc/mailname",
-            "/etc/modprobe.d",
-            "/etc/modules.conf",
-            "/etc/modules.conf.old",
             "/etc/mtab",
             "/etc/news",
             "/etc/news/organization",
@@ -200,18 +187,9 @@ class Settings:
             "/etc/nologin",
             "/etc/passwd",
             "/etc/passwd-",
-            "/etc/printcap",
             "/etc/shadow",
             "/etc/shadow-",
-            "/etc/shells",
-            "/etc/skel/.zshrc",
-            "/home/ftp",
             "/usr/sbin/policy-rc.d",
-            "/usr/share/doc/base-config",
-            "/usr/share/doc/base-config/README.Debian",
-            "/usr/share/doc/base-config/changelog.gz",
-            "/usr/share/doc/base-config/copyright",
-            "/usr/share/fonts/X11/misc/fonts.alias",
             "/usr/share/info/dir",
             "/usr/share/info/dir.old",
             "/var/cache/apt/archives/lock",
@@ -226,22 +204,15 @@ class Settings:
             "/var/cache/ldconfig/aux-cache",
             "/var/games",
             "/var/lib/apt/extended_states",
-            "/var/lib/apt/lists/partial/.delete-me-later",
             "/var/lib/dpkg/available",
             "/var/lib/dpkg/available-old", 
             "/var/lib/dpkg/diversions",
             "/var/lib/dpkg/diversions-old",
-            "/var/lib/dpkg/info/base-config.conffiles",
-            "/var/lib/dpkg/info/base-config.list",
-            "/var/lib/dpkg/info/base-config.md5sums",
-            "/var/lib/dpkg/info/base-config.postinst",
             "/var/lib/dpkg/lock", 
             "/var/lib/dpkg/status", 
             "/var/lib/dpkg/status-old", 
             "/var/lib/dpkg/statoverride",
             "/var/lib/dpkg/statoverride-old",
-            "/var/lib/dpkg/firebird",
-            "/var/lib/logrotate/status",
             "/var/lib/rbldns",
             "/var/log/alternatives.log",
             "/var/log/apt/history.log",
@@ -250,26 +221,19 @@ class Settings:
             "/var/log/dpkg.log",
             "/var/log/faillog",
             "/var/log/lastlog",
-            "/",
             ]
         self.ignored_patterns = [
             "/dev/",
-            "/etc/ssl/certs(/.*)?",
             "/etc/init.d/\.depend.*",
             "/lib/modules/.*/modules.*",
             "/run/.*",
-            "/usr/lib/python2\../site-packages/debconf.py[co]",
             "/var/backups/.*",
             "/var/cache/man/(/.*)?",
             "/var/lib/apt/lists/.*",
-            "/var/lib/cvs(/.*)?",
             "/var/lib/dpkg/alternatives",
             "/var/lib/dpkg/triggers/.*",
-            "/var/lib/ldap(/.*)?",
-            "/var/lib/maxdb(/.*)?",
             "/var/lib/mercurial-server(/.*)?",
             "/var/lib/onak(/.*)?",
-            "/var/lib/papercut(/.*)?",
             "/var/lib/insserv/run.*.log",
             "/var/lib/ucf/.*",
             "/var/lib/update-rc.d(/.*)?",

-- 
piuparts git repository