[Piuparts-commits] [piuparts] 03/03: p: ignore backup files from base-passwd

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch develop
in repository piuparts.

commit 36a80553db25bf9a09b0599791b9523d944b8436
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sun Jan 19 23:04:03 2014 +0100

    p: ignore backup files from base-passwd
    
    these backups are created by base-passwd and modified on upgrades that
    change the shell for most system accounts to /usr/sbin/nologin (#274229)
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
---
 debian/changelog | 5 +++++
 piuparts.py      | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 696c30b..367203a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,11 @@ piuparts (0.57) UNRELEASED; urgency=low
       python-debianbts and python-yaml.
 
   [ Andreas Beckmann ]
+  * piuparts.py:
+    - Add to ignored_files:
+      + /etc/group.org
+      + /etc/passwd.org
+      + /etc/shadow.org
   * piupartslib/packagesdb.py:
     - get_best_package_state(): New method that considers successfully tested
       providers of a virtual package if the real package of the same name
diff --git a/piuparts.py b/piuparts.py
index 4d357ea..473100e 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -209,6 +209,7 @@ class Settings:
             "/etc/crypttab",
             "/etc/group",
             "/etc/group-",
+            "/etc/group.org",
             "/etc/gshadow",
             "/etc/gshadow-",
             "/etc/hosts",
@@ -226,8 +227,10 @@ class Settings:
             "/etc/nologin",
             "/etc/passwd",
             "/etc/passwd-",
+            "/etc/passwd.org",
             "/etc/shadow",
             "/etc/shadow-",
+            "/etc/shadow.org",
             "/usr/share/info/dir",
             "/usr/share/info/dir.old",
             "/var/cache/ldconfig/aux-cache",

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/piuparts/piuparts.git