[Piuparts-commits] [SCM] piuparts git repository branch, piatti, updated. 0.44-627-g9f46e19

[Andreas Beckmann]

The following commit has been merged in the piatti branch:
commit 63ef282da10b997035b5ee79e336fd0fdb8adc0e
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Thu May 31 22:12:12 2012 +0200

    p: add more ignored files
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/debian/changelog b/debian/changelog
index 2011502..bc67b1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,10 +35,18 @@ piuparts (0.45) UNRELEASED; urgency=low
       + 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.
-    - Add to ignored_files:
+    - Add to ignored_files/ignored_patterns:
       + Default system logfiles as created by syslogd in /var/log/
       + Common empty directories in /etc not removed due to dpkg bug #316521
       + cdebconf status files
+      + /boot/grub/
+      + /etc/X11/default-display-manager
+      + /etc/aliases.db
+      + /etc/network/interfaces
+      + /usr/share/keyrings/debian-archive-removed-keys.gpg~
+      + /var/crash/
+      + /var/lib/citadel/(data/.*)?
+      + /var/lib/openvswitch/(pki/.*)?
   * 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 6ba5e3e..0111b81 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -168,7 +168,11 @@ class Settings:
             # piuparts state
             "/usr/sbin/policy-rc.d",
             # system state
+            "/boot/grub/",
+            "/etc/X11/",
+            "/etc/X11/default-display-manager",
             "/etc/aliases",
+            "/etc/aliases.db",
             "/etc/crypttab",
             "/etc/group",
             "/etc/group-",
@@ -179,6 +183,7 @@ class Settings:
             "/etc/ld.so.cache",
             "/etc/mailname",
             "/etc/mtab",
+            "/etc/network/interfaces",
             "/etc/news",
             "/etc/news/organization",
             "/etc/news/server",
@@ -191,12 +196,14 @@ class Settings:
             "/usr/share/info/dir",
             "/usr/share/info/dir.old",
             "/var/cache/ldconfig/aux-cache",
+            "/var/crash/",
             "/var/games/",
             # package management
             "/etc/apt/secring.gpg",
             "/etc/apt/trustdb.gpg",
             "/etc/apt/trusted.gpg",
             "/etc/apt/trusted.gpg~",
+            "/usr/share/keyrings/debian-archive-removed-keys.gpg~",
             "/var/cache/apt/archives/lock",
             "/var/cache/apt/pkgcache.bin", 
             "/var/cache/apt/srcpkgcache.bin",
@@ -281,14 +288,16 @@ class Settings:
             "/var/lib/ucf/.*",
             "/var/lib/update-rc.d/.*",
             # application data
+            "/var/lib/citadel/(data/.*)?",
             "/var/lib/mercurial-server/.*",
             "/var/lib/onak/.*",
+            "/var/lib/openvswitch/(pki/.*)?",
             "/var/log/exim/.*",
             "/var/log/exim4/.*",
             "/var/spool/exim/.*",
             "/var/spool/exim4/.*",
             "/var/spool/news/.*",
-            "/var/spool/squid(/.*)?",
+            "/var/spool/squid/(../.*)?",
             "/var/www/.*",
             # HACKS
             "/lib/modules/.*/modules.*",

-- 
piuparts git repository