Control: retitle -1 unblock: debsums/2.2.2
Control: tag -1 - moreinfo
Hi,
Axel Beckert wrote:
> Niels Thykier wrote:
> > I am a bit concerned with changing the default at this time of the
> > freeze.
[...]
> > Could we make the --no-ignore-obsolete the default for stretch
> > and then have piuparts use --ignore-obsolete for now? That should be
> > "safer" (read: less likely to unforeseen consequences).
>
> Granted. Will come up with a 2.2.2 release soonish.
Uploaded and has been accepted.
Andreas Beckmann wrote:
> On 2017-05-06 12:26, Axel Beckert wrote:
> > I assume that's fine for the Piuparts guys (Andreas and Holger Cc'ed)
> > as Andreas was able to run piuparts also with --no-ignore-obsolete. If
> > not, please speak up and explain. :-)
>
> We just need it in jessie-backports and installed on the slaves, then we
> can enable thazt option :-)
Can you please test 2.2.2 again as you did with 2.2.1~rc1? TIA!
Debdiff between 2.2 (currently in testing) and 2.2.2 (just uploaded)
without diff of the regenerated PO files (full debdiff attached):
diff -Nru debsums-2.2/debian/changelog debsums-2.2.2/debian/changelog
--- debsums-2.2/debian/changelog 2017-01-21 21:37:12.000000000 +0100
+++ debsums-2.2.2/debian/changelog 2017-05-07 16:05:58.000000000 +0200
@@ -1,3 +1,32 @@
+debsums (2.2.2) unstable; urgency=medium
+
+ [ Axel Beckert ]
+ * Don't make ignoring obsolete conffiles default for now. (See #861867
+ and #689508 for the discussion.)
+ * Regenerate po-files.
+
+ [ Dominique Dumont ]
+ * Add code comment to explain why a symlink loop triggers a die.
+ (Related to the fix for #822633.)
+
+ -- Axel Beckert <abe@debian.org> Sun, 07 May 2017 16:05:58 +0200
+
+debsums (2.2.1) unstable; urgency=low
+
+ * Release umodified as 2.2.1 and upload to unstable. Thanks to Andreas
+ Beckmann for testing the release candidate!
+
+ -- Axel Beckert <abe@debian.org> Wed, 03 May 2017 02:49:52 +0200
+
+debsums (2.2.1~rc1) experimental; urgency=low
+
+ * Ignore obsolete conffiles by default (c.f. #689508). Based on patch by
+ Andreas Beckmann, but with option to disable the ignoring of obsolete
+ conffiles.
+ * Regenerate po-files.
+
+ -- Axel Beckert <abe@debian.org> Sun, 30 Apr 2017 18:14:35 +0200
+
debsums (2.2) unstable; urgency=medium
[ Andreas Beckmann ]
diff -Nru debsums-2.2/debsums debsums-2.2.2/debsums
--- debsums-2.2/debsums 2017-01-21 19:51:36.000000000 +0100
+++ debsums-2.2.2/debsums 2017-05-07 13:38:04.000000000 +0200
@@ -78,6 +78,7 @@
is configured
--no-prelink report changed ELF files even if prelink is
configured
+ --ignore-obsolete ignore obsolete conffiles.
--help print this help, then exit
--version print version number, then exit
EOT
@@ -98,6 +99,7 @@
'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 },
@@ -262,7 +264,9 @@
$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})
@@ -440,6 +444,8 @@
}
my $fp = $root . '/' . join('/', @parts) . '/' . $token;
if ($seen{$fp}) {
+ # better die now with a clear error message then later
+ # with a sysopen fails
die "$self: Error: symlink loop detected in path '$path'. ",
"Please file a bug again $package.\n";
}
diff -Nru debsums-2.2/man/debsums.1 debsums-2.2.2/man/debsums.1
--- debsums-2.2/man/debsums.1 2016-05-09 17:04:38.000000000 +0200
+++ debsums-2.2.2/man/debsums.1 2017-05-07 13:43:02.000000000 +0200
@@ -105,6 +105,9 @@
.BR \-\-ignore\-permissions
Treat permission errors as warnings when running as non-root.
.TP
+.BR \-\-ignore\-obsolete
+Ignore obsolete conffiles.
+.TP
.B \-\-help
.PD 0
.TP
Regards, Axel
--
,''`. | Axel Beckert <abe@debian.org>, http://people.debian.org/~abe/
: :' : | Debian Developer, ftp.ch.debian.org Admin
`. `' | 4096R: 2517 B724 C5F6 CA99 5329 6E61 2FF9 CD59 6126 16B5
`- | 1024D: F067 EA27 26B9 C3FC 1486 202E C09E 1D89 9593 0EDE
Attachment:
debsums_2.2_2.2.2.dsc.debdiff.gz
Description: Binary data
Attachment:
signature.asc
Description: Digital signature