Control: retitle -1 [pre-approval] unblock: apt-cacher-ng/3.2.1-1
Hallo,
* Niels Thykier [Wed, May 15 2019, 07:53:00PM]:
> Control: tags -1 moreinfo
Sure, see attachments. As explained before, just a one-liner which uses
existing functionality (same content as before, now from a real package
build and git compare between tag/branch). If the meaning of the change
is not understandable, please check the effect of forgiveDlErrors member
in
https://salsa.debian.org/blade/apt-cacher-ng/blob/upstream/sid/source/cacheman.cc
and maybe related uses in
https://salsa.debian.org/blade/apt-cacher-ng/blob/upstream/sid/source/expiration.cc
.
BTW, maybe I was not precise enough before: this is a request for
pre-approval, the package is not uploaded yet.
Best Regards,
Eduard.
File lists identical (after any substitutions)
Control files: lines which differ (wdiff format)
------------------------------------------------
Depends: libbz2-1.0, libc6 (>= [-2.22),-] {+2.28),+} libgcc1 (>= 1:3.3.1),
liblzma5 (>= 5.1.1alpha+20120614), libssl1.1 (>= 1.1.0), libstdc++6 (>= 5.2),
libsystemd0 (>= 210), libwrap0 (>= 7.6-4~), zlib1g (>= 1:1.2.0), debconf (>=
0.5) | debconf-2.0, adduser, lsb-base (>= 3.0-6)
Installed-Size: [-1421-] {+1425+}
Version: [-3.2-1-] {+3.2-2+}
diff --git a/debian/changelog b/debian/changelog
index f33e8f1..b2d9d94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+apt-cacher-ng (3.2-2) unstable; urgency=medium
+
+ * For incorrect assumption of some existing SHA256SUMS files in Debian
+ repositories which makes the expiration task fail without a proper way
+ for the end user to recover from it. Now ignore a download error in this
+ case (similar handling as for other guesses), assuming that permanent
+ 404ing for other reasons than removal of remote content can be considered
+ unlikely (closes: #928957)
+
+ -- Eduard Bloch <bl...@debian.org> Fri, 17 May 2019 22:59:21 +0200
+
apt-cacher-ng (3.2-1) unstable; urgency=low
* New upstream version
diff --git a/source/expiration.cc b/source/expiration.cc
index 2125521..625a7be 100644
--- a/source/expiration.cc
+++ b/source/expiration.cc
@@ -806,6 +806,13 @@ bool expiration::ProcessRegular(const string & sPathAbs, const struct stat &stin
flags.eIdxType = EIDX_SHA256DILIST;
flags.vfile_ondisk = true;
flags.uptodate = false;
+
+ // the original source context will probably provide a viable source for
+ // this URL - it might go 404 if the whole folder is missing but then the
+ // referenced content would also be outdated/gone and not worth keeping
+ // in the cache anyway
+
+ flags.forgiveDlErrors = true;
}
// and last but not least - care only about the modern version of that index
m_metaFilesRel.erase(idir + "MD5SUMS");
