diff options
| author | Colin Watson <cjwatson@canonical.com> | 2008-01-09 22:24:22 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@canonical.com> | 2008-01-09 22:24:22 +0000 |
| commit | b26daf93a588aeed441d5a0622b3e96ec7dffe91 (patch) | |
| tree | b002c896e8c2575c3efcd7081470fb012662319a | |
| parent | ea67a49ab6632ab789230e31bd5302a0a5b87dc1 (diff) | |
* apt-pkg/algorithms.cc:
- Since APT::Get::List-Cleanup and APT::List-Cleanup both default to
true, the effect of the compatibility code was to require both of them
to be set to false in order to disable list cleanup; this broke the
installer. Instead, disable list cleanup if either of them is set to
false.
| -rw-r--r-- | apt-pkg/algorithms.cc | 2 | ||||
| -rw-r--r-- | debian/changelog | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index 6e2b97557..57b85e24f 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -1356,7 +1356,7 @@ bool ListUpdate(pkgAcquireStatus &Stat, // Keep "APT::Get::List-Cleanup" name for compatibility, but // this is really a global option for the APT library now if (!TransientNetworkFailure && !Failed && - (_config->FindB("APT::Get::List-Cleanup",true) == true || + (_config->FindB("APT::Get::List-Cleanup",true) == true && _config->FindB("APT::List-Cleanup",true) == true)) { if (Fetcher.Clean(_config->FindDir("Dir::State::lists")) == false || diff --git a/debian/changelog b/debian/changelog index 22555e57b..bd9061734 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +apt (0.7.9ubuntu4) UNRELEASED; urgency=low + + * apt-pkg/algorithms.cc: + - Since APT::Get::List-Cleanup and APT::List-Cleanup both default to + true, the effect of the compatibility code was to require both of them + to be set to false in order to disable list cleanup; this broke the + installer. Instead, disable list cleanup if either of them is set to + false. + + -- Colin Watson <cjwatson@ubuntu.com> Wed, 09 Jan 2008 22:22:39 +0000 + apt (0.7.9ubuntu3) hardy; urgency=low * merged the apt--DoListUpdate branch, this provides a common interface |