Adjust DestFile in ReverifyAfterIMS() to not include compr Extension

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 923a153a785ff762974f1bb3c7006048f75f32c0..d6b00f9b7b7b57747a698a5edeb1d851fe474783 100644 (file)
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -1104,6 +1104,13 @@ std::string pkgAcqIndex::GetFinalFilename() const
 void pkgAcqIndex::ReverifyAfterIMS()
 {
    std::string const compExt = CompressionExtension.substr(0, CompressionExtension.find(' '));
 void pkgAcqIndex::ReverifyAfterIMS()
 {
    std::string const compExt = CompressionExtension.substr(0, CompressionExtension.find(' '));

+
+   // update destfile to *not* include the compression extension when doing
+   // a reverify (as its uncompressed on disk already)
+   DestFile =  _config->FindDir("Dir::State::lists") + "partial/";
+   DestFile += URItoFileName(RealURI);
+
+   // adjust DestFile if its compressed on disk

    if (_config->FindB("Acquire::GzipIndexes",false) == true)
       DestFile += compExt;
 
    if (_config->FindB("Acquire::GzipIndexes",false) == true)
       DestFile += compExt;
 

diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index df409fa36b54e21eeebc1eeef0bb6f51e2b7cb8f..c5eb56f0e236ac7f7c9dba829118d2f330af7bfe 100644 (file)
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -1525,7 +1525,7 @@ bool FileFd::Read(void *To,unsigned long long Size,unsigned long long *Actual)
            int err;
            char const * const errmsg = BZ2_bzerror(d->bz2, &err);
            if (err != BZ_IO_ERROR)
            int err;
            char const * const errmsg = BZ2_bzerror(d->bz2, &err);
            if (err != BZ_IO_ERROR)

-              return FileFdError("BZ2_bzread: %s (%d: %s)", _("Read error"), err, errmsg);
+              return FileFdError("BZ2_bzread: %s %s (%d: %s)", FileName.c_str(), _("Read error"), err, errmsg);

         }
 #endif
 #ifdef HAVE_LZMA
         }
 #endif
 #ifdef HAVE_LZMA