← Back to branch summary

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

« back to all changes in this revision

Viewing changes to apt-pkg/aptconfiguration.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/aptconfiguration.cc
69
69
                types.push_back(*o);
70
70
        }
71
71
 
72
 
        // default to preferring gzip, so that compressed indexes work
73
 
        if (order.empty())
74
 
                types.push_back("gz");
75
 
 
76
72
        // move again over the option tree to add all missing compression types
77
73
        ::Configuration::Item const *Types = _config->Tree("Acquire::CompressionTypes");
78
74
        if (Types != 0)