From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Fri, 25 Feb 2011 11:29:13 +0000 (+0100)
Subject: * apt-pkg/deb/debindexfile.cc:
X-Git-Tag: 0.8.12~3^2~7
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/1aadba5adf0c32a44548baea9ba734336a578387

* 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 9961b5ae4..1e8c04033 100644
--- 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";
-   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);
diff --git a/debian/changelog b/debian/changelog
index 986b6f876..68c83808b 100644
--- 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
+  * 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