From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Fri, 8 Aug 2008 22:34:24 +0000 (+0200)
Subject: * apt-pkg/indexcopy.cc:
X-Git-Tag: 0.7.24ubuntu1~61
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/80fbbbd91708a8f0da24161d0a8ababc9f968425?hp=00a4f00b44bc09cd62c7ecadf95b0a7825eb8192

* apt-pkg/indexcopy.cc:
  - support having CDs with no Packages file (just a Packages.gz)
    by not forcing a verification on non-existing files
   (LP: #255545)
---

diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc
index 9e5c03e0b..b1e75e30f 100644
--- a/apt-pkg/indexcopy.cc
+++ b/apt-pkg/indexcopy.cc
@@ -522,6 +522,15 @@ bool SigVerify::Verify(string prefix, string file, indexRecords *MetaIndex)
 {
    const indexRecords::checkSum *Record = MetaIndex->Lookup(file);
 
+   // we skip non-existing files in the verifcation to support a cdrom
+   // with no Packages file (just a Package.gz), see LP: #255545
+   // (non-existing files are not considered a error)
+   if(!FileExists(prefix+file))
+   {
+      _error->Warning("Skipping non-exisiting file %s", string(prefix+file).c_str());
+      return true;
+   }
+
    if (!Record) 
    {
       _error->Warning("Can't find authentication record for: %s",file.c_str());
diff --git a/debian/changelog b/debian/changelog
index e5669830d..5df4cc26b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ apt (0.7.14ubuntu6) UNRELEASED; urgency=low
     - remove "linux-image" (and friends) from the auto-remove
       blacklist. we have the kernel fallback infrastructure now
       in intrepid (thanks to BenC)
+  * apt-pkg/indexcopy.cc:
+    - support having CDs with no Packages file (just a Packages.gz)
+      by not forcing a verification on non-existing files
+     (LP: #255545)
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 07 Aug 2008 16:28:05 +0200