← Back to branch summary

~ubuntu-branches/ubuntu/natty/apt/natty

« back to all changes in this revision

Viewing changes to apt-pkg/acquire-item.cc

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt, Michael Vogt, Martin Pitt
  • Date: 2010-11-25 08:50:37 UTC
  • Revision ID: james.westby@ubuntu.com-20101125085037-uhnlrs2phclkmw5j
Tags: 0.8.9ubuntu4
[ Michael Vogt ]
* cmdline/apt-key:
  - set timeout of wget for net-update to 90 seconds (thanks to \sh)

[ Martin Pitt ]
* Revert r1819 and r1820 to disable compressed indexes by default again.
  Testing has brought up a few places where this seriously degrades
  performance, mostly in applications which iterate through all available
  package records, like update-apt-xapian-index or synaptic. See
  https://bugs.launchpad.net/ubuntu/+bugs?field.tag=apt-compressed-indexes

Show diffs side-by-side

added added

removed removed

Lines of Context:
apt-pkg/acquire-item.cc
672
672
{
673
673
   string Final = _config->FindDir("Dir::State::lists");
674
674
   Final += URItoFileName(RealURI);
675
 
   if (_config->FindB("Acquire::GzipIndexes",true))
 
675
   if (_config->FindB("Acquire::GzipIndexes",false))
676
676
      Final += ".gz";
677
677
   
678
678
   struct stat Buf;
795
795
 
796
796
   // The files timestamp matches
797
797
   if (StringToBool(LookupTag(Message,"IMS-Hit"),false) == true) {
798
 
       if (_config->FindB("Acquire::GzipIndexes",true) && compExt == "gz")
 
798
       if (_config->FindB("Acquire::GzipIndexes",false) && compExt == "gz")
799
799
          // Update DestFile for .gz suffix so that the clean operation keeps it
800
800
          DestFile += ".gz";
801
801
      return;
809
809
   string decompProg;
810
810
 
811
811
   // If we enable compressed indexes and already have gzip, keep it
812
 
   if (_config->FindB("Acquire::GzipIndexes",true) && compExt == "gz" && !Local) {
 
812
   if (_config->FindB("Acquire::GzipIndexes",false) && compExt == "gz" && !Local) {
813
813
      string FinalFile = _config->FindDir("Dir::State::lists");
814
814
      FinalFile += URItoFileName(RealURI) + ".gz";
815
815
      Rename(DestFile,FinalFile);