* Fix regression about APT::Get::List-Cleanup setting being ignored,

  closes: #466052.

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 &&
    // 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 ||
        _config->FindB("APT::List-Cleanup",true) == true))
    {
       if (Fetcher.Clean(_config->FindDir("Dir::State::lists")) == false ||

diff --git a/configure.in b/configure.in
index 5f19c98a6f36b3b69d743eabf9009a9c3f2779cd..22b373f910e95aff4d51ab164ad9c0ae1ba8852a 100644 (file)
--- a/configure.in
+++ b/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_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)
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)

diff --git a/debian/changelog b/debian/changelog
index 8f6de6f259f254aeafa9868cecd479e44ecfc6d9..c4067e5c1c21c16a04c1597fd4e5f1532d76653c 100644 (file)
--- a/debian/changelog
+++ b/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.
   [ 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
 
 
  -- Otavio Salvador <otavio@ossystems.com.br>  Thu, 17 Jan 2008 22:36:46 -0200