[debsums] 01/01: Ignore obsolete conffiles by default (c.f. #689508)

[Axel Beckert]

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

abe pushed a commit to branch ignore-obsolete-689508
in repository debsums.

commit 6f4f9daf56b23a8ac024423dcc610f036bd3de75
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Tue Apr 25 01:57:00 2017 +0200

    Ignore obsolete conffiles by default (c.f. #689508)
    
    Based on patch by Andreas Beckmann, but with option to disable the
    ignoring of obsolete conffiles.
---
 debian/changelog | 8 ++++++++
 debsums          | 9 ++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 959882c..84bc7ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debsums (2.2.1) UNRELEASED; urgency=medium
+
+  * Ignore obsolete conffiles by default (c.f. #689508). Based on patch by
+    Andreas Beckmann, but with option to disable the ignoring of obsolete
+    conffiles.
+
+ -- Axel Beckert <abe at debian.org>  Tue, 25 Apr 2017 01:37:01 +0200
+
 debsums (2.2) unstable; urgency=medium
 
   [ Andreas Beckmann ]
diff --git a/debsums b/debsums
index faee262..6043a1e 100755
--- a/debsums
+++ b/debsums
@@ -78,6 +78,7 @@ Options:
                               is configured
      --no-prelink             report changed ELF files even if prelink is
                               configured
+     --no-ignore-obsolete     don't ignore obsolete conffiles.
      --help                   print this help, then exit
      --version                print version number, then exit
 EOT
@@ -98,6 +99,7 @@ GetOptions (
     'locale-purge!'	=> \my $localepurge,
     'prelink!'		=> \my $prelink,
     'ignore-permissions' => \my $ignore_permissions,
+    'ignore-obsolete!'  => \my $ignore_obsolete,
     g			=> sub { $gen_opt = 'missing' },
     help		=> sub { print $help; exit },
     version		=> sub { print version_info(); exit },
@@ -206,6 +208,9 @@ if (!defined $prelink or $prelink)
     ($prelink) = grep -x, map +("$_.bin", $_), '/usr/sbin/prelink';
 }
 
+# default is to use ignore obsolete conffiles, see #689508
+$ignore_obsolete = 1 unless defined $ignore_obsolete;
+
 $silent++ if $changed;
 
 my @debpath = '.';
@@ -262,7 +267,9 @@ my %replaced;
             $package_name{$field{"Package"}} = $field{"binary:Package"};
         }
         $installed{$field{"binary:Package"}}{Conffiles} = {
-            map m!^\s*/(\S+)\s+([\da-f]+)!, split /\n/, $field{Conffiles}
+            map m!^\s*/(\S+)\s+([\da-f]+)!,
+                grep { not ($ignore_obsolete and / obsolete$/) }
+                split /\n/, $field{Conffiles}
         } if $field{Conffiles};
 
         for (split /,\s*/, $field{Replaces})

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/debsums.git