[debsums] 01/02: Don't make ignoring obsolete conffiles default for now.

[Axel Beckert]

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

abe pushed a commit to branch master
in repository debsums.

commit 063d6550cdb0c58124393c36046a9ab33dd15397
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Sun May 7 13:41:14 2017 +0200

    Don't make ignoring obsolete conffiles default for now.
    
    See #861867 and #689508 for the discussion.
---
 debian/changelog | 7 +++++++
 debsums          | 5 +----
 man/debsums.1    | 4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 712e49c..9c17bb3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debsums (2.2.2) UNRELEASED; urgency=medium
+
+  * Don't make ignoring obsolete conffiles default for now. (See #861867
+    and #689508 for the discussion.)
+
+ -- Axel Beckert <abe at debian.org>  Sun, 07 May 2017 13:25:38 +0200
+
 debsums (2.2.1) unstable; urgency=low
 
   * Release umodified as 2.2.1 and upload to unstable. Thanks to Andreas
diff --git a/debsums b/debsums
index 4b14f86..e98eabe 100755
--- a/debsums
+++ b/debsums
@@ -78,7 +78,7 @@ Options:
                               is configured
      --no-prelink             report changed ELF files even if prelink is
                               configured
-     --no-ignore-obsolete     don't ignore obsolete conffiles.
+     --ignore-obsolete        ignore obsolete conffiles.
      --help                   print this help, then exit
      --version                print version number, then exit
 EOT
@@ -208,9 +208,6 @@ 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 = '.';
diff --git a/man/debsums.1 b/man/debsums.1
index 0c72f69..c3816ec 100644
--- a/man/debsums.1
+++ b/man/debsums.1
@@ -105,8 +105,8 @@ Report changed ELF files even if prelink is configured.
 .BR \-\-ignore\-permissions
 Treat permission errors as warnings when running as non-root.
 .TP
-.BR \-\-no\-ignore\-obsolete
-Disable the ignoring of obsolete conffiles.
+.BR \-\-ignore\-obsolete
+Ignore obsolete conffiles.
 .TP
 .B \-\-help
 .PD 0

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