Browse Source

* apt-pkg/deb/debindexfile.cc:

- If we do not find uncompressed package/source/translation indexes, look
    for gzip compressed ones.
debian/1.8.y
martin@piware.de 12 years ago
parent
commit
ec7a129eeb
  1. 22
      apt-pkg/deb/debindexfile.cc
  2. 3
      debian/changelog

22
apt-pkg/deb/debindexfile.cc

@ -106,8 +106,14 @@ string debSourcesIndex::Info(const char *Type) const
/* */
inline string debSourcesIndex::IndexFile(const char *Type) const
{
return URItoFileName(IndexURI(Type));
string s = URItoFileName(IndexURI(Type));
string sgzip = s + ".gz";
if (!FileExists(s) && FileExists(sgzip))
return sgzip;
else
return s;
}
string debSourcesIndex::IndexURI(const char *Type) const
{
string Res;
@ -213,7 +219,12 @@ string debPackagesIndex::Info(const char *Type) const
/* */
inline string debPackagesIndex::IndexFile(const char *Type) const
{
return _config->FindDir("Dir::State::lists") + URItoFileName(IndexURI(Type));
string s =_config->FindDir("Dir::State::lists") + URItoFileName(IndexURI(Type));
string sgzip = s + ".gz";
if (!FileExists(s) && FileExists(sgzip))
return sgzip;
else
return s;
}
string debPackagesIndex::IndexURI(const char *Type) const
{
@ -340,7 +351,12 @@ debTranslationsIndex::debTranslationsIndex(string URI,string Dist,string Section
/* */
inline string debTranslationsIndex::IndexFile(const char *Type) const
{
return _config->FindDir("Dir::State::lists") + URItoFileName(IndexURI(Type));
string s =_config->FindDir("Dir::State::lists") + URItoFileName(IndexURI(Type));
string sgzip = s + ".gz";
if (!FileExists(s) && FileExists(sgzip))
return sgzip;
else
return s;
}
string debTranslationsIndex::IndexURI(const char *Type) const
{

3
debian/changelog

@ -8,6 +8,9 @@ apt (0.7.26~exp5) UNRELEASED; urgency=low
* apt-pkg/contrib/fileutl.{h,cc}:
- Add support for transparent reading of gzipped files.
- Link against zlib (in apt-pkg/makefile) and add zlib build dependency.
* apt-pkg/deb/debindexfile.cc:
- If we do not find uncompressed package/source/translation indexes, look
for gzip compressed ones.
-- Christian Perrier <bubulle@debian.org> Tue, 11 May 2010 19:52:00 +0200

Loading…
Cancel
Save