diff options
| author | Michael Vogt <mvo@debian.org> | 2011-02-08 10:27:51 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2011-02-08 10:27:51 +0100 |
| commit | 09b8bd3226a68272f98e4020d10348ff26642500 (patch) | |
| tree | 1394a74a187ce61982c6c8649721de2f543459a1 /apt-pkg/deb/debindexfile.cc | |
| parent | 7c748f4aa1bd47089672353fd1a401d1c5c94723 (diff) | |
| parent | 4c6cf49317769725fee34a132c52ec1fe076b8b5 (diff) | |
merged from lp:~mvo/apt/mvo (which is really lp:~donkult/apt/sid with some updated comments ;)
Diffstat (limited to 'apt-pkg/deb/debindexfile.cc')
| -rw-r--r-- | apt-pkg/deb/debindexfile.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index af1209ccb..9961b5ae4 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -324,8 +324,14 @@ bool debPackagesIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const return _error->Error("Problem with MergeList %s",PackageFile.c_str()); // Check the release file - string ReleaseFile = debReleaseIndex(URI,Dist).MetaIndexFile("Release"); + string ReleaseFile = debReleaseIndex(URI,Dist).MetaIndexFile("InRelease"); + bool releaseExists = false; if (FileExists(ReleaseFile) == true) + releaseExists = true; + else + ReleaseFile = debReleaseIndex(URI,Dist).MetaIndexFile("Release"); + + if (releaseExists == true || FileExists(ReleaseFile) == true) { FileFd Rel(ReleaseFile,FileFd::ReadOnly); if (_error->PendingError() == true) |