Hi, I've prepared an NMU for #744398 and uploaded it to DELAYED/2. Please tell me if I should upload it with less delay. (I don't think more delay makes much sense.)
As with my previous NMU, I've pushed my changes to the branch "nmu" (http://anonscm.debian.org/gitweb/?p=collab-maint/debsums.git;a=shortlog;h=refs/heads/nmu) and will merge it into the master branch once my NMU is in the archive. Addtionally, I've also attached the debdiff to this mail. Holger Levsen wrote: > On Samstag, 26. April 2014, Axel Beckert wrote: > > I had a _short_ look at the code and I think I have an idea where I > > could hook into debsums' workflow. Here's a prelimiary patch which may > > mitigate these issues: > > this patch works for me well, thanks a lot! It didn't work properly with the --root option. I've updated the patch and tested the updated patch against a Wheezy pbuilder chroot which I manually upgraded to Jessie within a pbuilder login session. With the current version I could reproduce the issue. With the just uploaded version I can't anymore. > > It doesn't seem perfect (if it considers a file FAILED, it checks if > > the assumed package is the correct one and ignores the case if not), > > AIUI thats exactly the desired behaviour as discussed in #689508 So would the above fix also fix #689508? So far I've just closed #744398 in my NMU as that was my goal. (Cc'ed 689508 and its submitter.) If that's the case, I'd close that bug report after my NMU reached the archive. (I don't think removing the upload and reuploading a version just with a modified changelog entry is worth the effort. I though haven't pushed the git tag yet.) Regards, Axel -- ,''`. | Axel Beckert <a...@debian.org>, http://people.debian.org/~abe/ : :' : | Debian Developer, ftp.ch.debian.org Admin `. `' | 1024D: F067 EA27 26B9 C3FC 1486 202E C09E 1D89 9593 0EDE `- | 4096R: 2517 B724 C5F6 CA99 5329 6E61 2FF9 CD59 6126 16B5
diff -Nru debsums-2.0.52+nmu1/debian/changelog debsums-2.0.52+nmu2/debian/changelog
--- debsums-2.0.52+nmu1/debian/changelog 2013-08-03 15:05:07.000000000 +0200
+++ debsums-2.0.52+nmu2/debian/changelog 2014-05-29 19:50:49.000000000 +0200
@@ -1,3 +1,11 @@
+debsums (2.0.52+nmu2) unstable; urgency=medium
+
+ * Non-maintainer upload
+ * Suppress reporting conffiles which were moved to a new package as
+ modified in the old package. (Closes: #744398)
+
+ -- Axel Beckert <a...@debian.org> Thu, 29 May 2014 19:50:48 +0200
+
debsums (2.0.52+nmu1) unstable; urgency=low
* Non-maintainer upload
diff -Nru debsums-2.0.52+nmu1/debsums debsums-2.0.52+nmu2/debsums
--- debsums-2.0.52+nmu1/debsums 2013-07-30 00:20:54.000000000 +0200
+++ debsums-2.0.52+nmu2/debsums 2014-05-29 17:23:58.000000000 +0200
@@ -462,6 +462,13 @@
return 0;
}
+ my $correct_package = `dpkg-query "--admindir=$DPKG" -S "$path" | awk -F: '{print \$1}'`;
+ chomp($correct_package);
+ if ($pack ne $correct_package) {
+ #print "$pack != $correct_package\n";
+ return 0;
+ }
+
if ($changed)
{
print $root, "/", $path, "\n";
signature.asc
Description: Digital signature
