Browse Source

* Fix regression about APT::Get::List-Cleanup setting being ignored,
closes: #466052.

Otavio Salvador 18 years ago
parent
commit
a1704ec47a
3 changed files with 4 additions and 2 deletions
  1. 1 1
      apt-pkg/algorithms.cc
  2. 1 1
      configure.in
  3. 2 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 ||

+ 1 - 1
configure.in

@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.7.10")
+AC_DEFINE_UNQUOTED(VERSION,"0.7.11")
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)

+ 2 - 0
debian/changelog

@@ -11,6 +11,8 @@ apt (0.7.11) UNRELEASED; urgency=low
   [ Otavio Salvador ]
   * Applied patch from Robert Millan <rmh@aybabtu.com> to fix the error
     message when gpgv isn't installed, closes: #452640.
+  * Fix regression about APT::Get::List-Cleanup setting being ignored,
+    closes: #466052.
 
  -- Otavio Salvador <otavio@ossystems.com.br>  Thu, 17 Jan 2008 22:36:46 -0200