diff options
| author | Michael Vogt <mvo@debian.org> | 2013-12-04 07:58:37 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-12-04 08:07:00 +0100 |
| commit | 019dfaedcc169837f88cc0b971fd8897828d93bf (patch) | |
| tree | 7e4bb96b8db845912163a678ef4e7c741203ad4f /cmdline | |
| parent | 1a22e16a1ebf08243c1836e1c593cb966cae4850 (diff) | |
add test, deal with InRelease
Diffstat (limited to 'cmdline')
| -rw-r--r-- | cmdline/apt-get.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 2370318e8..3003c1971 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -293,7 +293,10 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, if (&SI == (*IF)) { std::string dirname = _config->FindDir("Dir::State::lists"); - std::string path = dirname + URItoFileName((*S)->GetURI()) + "dists_" + (*S)->GetDist() + "_Release"; + std::string path; + path = dirname + URItoFileName((*S)->GetURI()) + "dists_" + (*S)->GetDist() + "_Release"; + if (!FileExists(path)) + path = dirname + URItoFileName((*S)->GetURI()) + "dists_" + (*S)->GetDist() + "_InRelease"; indexRecords records; records.Load(path); if (records.GetSuite() == DefRel) @@ -327,7 +330,6 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, // was the version check above an exact match? If so, we don't need to look further if (VerTag.empty() == false && (VerTag == Ver)) { - std::cerr << "meep" << std::endl; break; } } |