Bladeren bron

* 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 18 jaren geleden
bovenliggende
commit
b26daf93a5
2 gewijzigde bestanden met toevoegingen van 12 en 1 verwijderingen
  1. 1 1
      apt-pkg/algorithms.cc
  2. 11 0
      debian/changelog

+ 1 - 1
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 ||

+ 11 - 0
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