[Piuparts-commits] [piuparts] 01/01: p: let debsums always ignore obsolete conffiles

[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 edab6a4d39d93274c895e416f46a9307b38bd400
Author: Andreas Beckmann <anbe at debian.org>
Date:   Wed Aug 9 20:53:14 2017 +0200

    p: let debsums always ignore obsolete conffiles
    
    --ignore-obsolete was added in debsums 2.2.2
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 debian/changelog | 2 ++
 debian/control   | 2 +-
 piuparts.py      | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index aac556b..8e9c81f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ piuparts (0.79) UNRELEASED; urgency=medium
       packages that would fail anyway, but are resource hogs or otherwise
       break piuparts.
     - Silence diff_meta_data() for "others" for --warn-on-others.
+    - Let debsums always ignore obsolete conffiles.
   * piuparts.conf:
     - Use relative expiration ages.
   * piuparts.conf.anbe: Add some more example sections.
@@ -35,6 +36,7 @@ piuparts (0.79) UNRELEASED; urgency=medium
     - Detect appstream metadata errors.
   * slave_run: Ensure screen is run with SHELL=/bin/bash.
   * Makefile: Split build and install targets between master and slave.
+  * Bump debsums dependency to (>= 2.2.2~) for --ignore-obsolete.
 
  -- Holger Levsen <holger at debian.org>  Mon, 31 Jul 2017 13:35:18 -0400
 
diff --git a/debian/control b/debian/control
index 28de27f..09c9bd1 100644
--- a/debian/control
+++ b/debian/control
@@ -34,7 +34,7 @@ Pre-Depends:
 Depends:
  piuparts-common (= ${binary:Version}),
  debootstrap,
- debsums,
+ debsums (>= 2.2.2~),
  lsb-release,
  lsof,
  python-debian,
diff --git a/piuparts.py b/piuparts.py
index 21a5d7d..cb8428f 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -1335,7 +1335,7 @@ class Chroot:
         return (removed, added)
 
     def check_debsums(self):
-        (status, output) = run(["debsums", "--root", self.name, "-ac"], ignore_errors=True)
+        (status, output) = run(["debsums", "--root", self.name, "-ac", "--ignore-obsolete"], ignore_errors=True)
         if status != 0:
             logging.error("FAIL: debsums reports modifications inside the chroot:\n%s" %
                           indent_string(output.replace(self.name, "")))

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