[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 ed06a04c52289938ebbdfc8fe8dca13d38fdca1e
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Thu May 31 14:46:06 2012 +0200

    p: regroup ignore lists
    
    reorder ignore lists, add some comments to build groups
    unify regexps
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/debian/changelog b/debian/changelog
index e6b6fc6..7ae58d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,8 @@ piuparts (0.45) UNRELEASED; urgency=low
     - 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.
+      + Group ignore entries into piuparts state, system state, package
+        management, logfiles, home directories, application data, and HACKS.
   * 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 30e153e..3cb2333 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -165,11 +165,10 @@ class Settings:
         self.warn_on_others = False
         self.warn_on_leftovers_after_purge = False
         self.ignored_files = [
+            # piuparts state
+            "/usr/sbin/policy-rc.d",
+            # system state
             "/etc/aliases",
-            "/etc/apt/secring.gpg",
-            "/etc/apt/trustdb.gpg",
-            "/etc/apt/trusted.gpg",
-            "/etc/apt/trusted.gpg~",
             "/etc/crypttab",
             "/etc/group",
             "/etc/group-",
@@ -189,9 +188,15 @@ class Settings:
             "/etc/passwd-",
             "/etc/shadow",
             "/etc/shadow-",
-            "/usr/sbin/policy-rc.d",
             "/usr/share/info/dir",
             "/usr/share/info/dir.old",
+            "/var/cache/ldconfig/aux-cache",
+            "/var/games/",
+            # package management
+            "/etc/apt/secring.gpg",
+            "/etc/apt/trustdb.gpg",
+            "/etc/apt/trusted.gpg",
+            "/etc/apt/trusted.gpg~",
             "/var/cache/apt/archives/lock",
             "/var/cache/apt/pkgcache.bin", 
             "/var/cache/apt/srcpkgcache.bin",
@@ -201,8 +206,6 @@ class Settings:
             "/var/cache/debconf/passwords.dat",
             "/var/cache/debconf/templates.dat",
             "/var/cache/debconf/templates.dat-old",
-            "/var/cache/ldconfig/aux-cache",
-            "/var/games",
             "/var/lib/apt/extended_states",
             "/var/lib/dpkg/available",
             "/var/lib/dpkg/available-old", 
@@ -213,39 +216,46 @@ class Settings:
             "/var/lib/dpkg/status-old", 
             "/var/lib/dpkg/statoverride",
             "/var/lib/dpkg/statoverride-old",
-            "/var/lib/rbldns",
             "/var/log/alternatives.log",
             "/var/log/apt/history.log",
             "/var/log/apt/term.log",
             "/var/log/bootstrap.log",
             "/var/log/dpkg.log",
+            # system logfiles
             "/var/log/faillog",
             "/var/log/lastlog",
+            # home directories of system accounts
+            "/var/lib/rbldns/",
+            # HACKS
             ]
         self.ignored_patterns = [
+            # system state
             "/dev/",
             "/etc/init.d/\.depend.*",
-            "/lib/modules/.*/modules.*",
             "/run/.*",
             "/var/backups/.*",
             "/var/cache/man/(/.*)?",
+            "/var/mail/.*",
+            "/var/run/.*",
+            # package management
             "/var/lib/apt/lists/.*",
             "/var/lib/dpkg/alternatives",
             "/var/lib/dpkg/triggers/.*",
-            "/var/lib/mercurial-server(/.*)?",
-            "/var/lib/onak(/.*)?",
             "/var/lib/insserv/run.*.log",
             "/var/lib/ucf/.*",
             "/var/lib/update-rc.d(/.*)?",
+            # application data
+            "/var/lib/mercurial-server/.*",
+            "/var/lib/onak/.*",
             "/var/log/exim/.*",
             "/var/log/exim4/.*",
-            "/var/mail(/.*)?",
             "/var/spool/exim/.*",
             "/var/spool/exim4/.*",
             "/var/spool/news(/.*)?",
             "/var/spool/squid(/.*)?",
-            "/var/run/.*",
             "/var/www(/.*)?",
+            # HACKS
+            "/lib/modules/.*/modules.*",
             ]
         self.non_pedantic_ignore_patterns = [
             "/tmp/.*"

-- 
piuparts git repository