* apt-pkg/deb/debindexfile.cc:

  - ignore missing deb-src files in /var/lib/apt/lists, thanks
    to Thorsten Spindler (LP: #85590)

diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc
index 9961b5ae44178e135c8a2e78b3968db1b43c0281..1e8c040333b028def25e8330b484ab4cb15ac035 100644 (file)
--- a/apt-pkg/deb/debindexfile.cc
+++ b/apt-pkg/deb/debindexfile.cc
@@ -66,7 +66,10 @@ pkgSrcRecords::Parser *debSourcesIndex::CreateSrcParser() const
    string SourcesURI = _config->FindDir("Dir::State::lists") + 
       URItoFileName(IndexURI("Sources"));
    string SourcesURIgzip = SourcesURI + ".gz";
    string SourcesURI = _config->FindDir("Dir::State::lists") + 
       URItoFileName(IndexURI("Sources"));
    string SourcesURIgzip = SourcesURI + ".gz";

-   if (!FileExists(SourcesURI) && FileExists(SourcesURIgzip))
+
+   if (!FileExists(SourcesURI) && !FileExists(SourcesURIgzip))
+      return NULL;
+   else if (!FileExists(SourcesURI) && FileExists(SourcesURIgzip))

       SourcesURI = SourcesURIgzip;
 
    return new debSrcRecordParser(SourcesURI,this);
       SourcesURI = SourcesURIgzip;
 
    return new debSrcRecordParser(SourcesURI,this);

diff --git a/debian/changelog b/debian/changelog
index 986b6f87615a5f3f36cf7f5b4cb9e01107429b79..68c83808b367d2cb5a707c32ee13ce4a024ccfeb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ apt (0.8.12) UNRELEASED; urgency=low
       mistake reported in bug LP: #641673, thanks to Robert Roth
   * merged lp:~evfool/apt/fix418552:
     - Grammar fix for bug LP: #418552, thanks to Robert Roth
       mistake reported in bug LP: #641673, thanks to Robert Roth
   * merged lp:~evfool/apt/fix418552:
     - Grammar fix for bug LP: #418552, thanks to Robert Roth

+  * apt-pkg/deb/debindexfile.cc:
+    - ignore missing deb-src files in /var/lib/apt/lists, thanks
+      to Thorsten Spindler (LP: #85590)

 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 10 Feb 2011 17:37:56 +0100
 
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 10 Feb 2011 17:37:56 +0100