diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2008-01-10 12:08:21 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2008-01-10 12:08:21 +0100 |
| commit | b7c5ca8c3138c2a8045bb4ef3545cb348a05e67b (patch) | |
| tree | b27d7e41bdc519d69a12e8e975d9edd6eaef196c | |
| parent | 51f13f6ab9c793b6972f6dd945149a4f97549e04 (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 | 12 |
2 files changed, 13 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 ef4a21b6f..700e93af7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +apt (0.7.11) UNRELEASED; urgency=low + + [ Colin Watson ] + * 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. + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 10 Jan 2008 12:06:12 +0100 + apt (0.7.10) unstable; urgency=low [ Otavio Salvador ] |