diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-02-25 12:29:13 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-02-25 12:29:13 +0100 |
| commit | 1aadba5adf0c32a44548baea9ba734336a578387 (patch) | |
| tree | a4e574920b3760215344e26b4b47c714351c9be1 | |
| parent | 2311b3fe66d77d5a8ed3ce4e0878e2b7ef109bd3 (diff) | |
| download | apt-1aadba5adf0c32a44548baea9ba734336a578387.tar.gz | |
* apt-pkg/deb/debindexfile.cc:
- ignore missing deb-src files in /var/lib/apt/lists, thanks
to Thorsten Spindler (LP: #85590)
| -rw-r--r-- | apt-pkg/deb/debindexfile.cc | 5 | ||||
| -rw-r--r-- | debian/changelog | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index 9961b5ae..1e8c0403 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 986b6f87..68c83808 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 |