* 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.

diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 6e2b9755730c11b824dde72ce199b791a5d4972b..57b85e24fec42cccd5176b774bb1ea558c285172 100644 (file)
--- 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 22555e57b50fd93d967469c418350260c8aaf609..bd9061734f1dc556571920be2ed2f3eb02599141 100644 (file)
--- 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