summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2008-02-16 20:22:20 -0200
committerOtavio Salvador <otavio@ossystems.com.br>2008-02-16 20:22:20 -0200
commita1704ec47a2f82516586351bf801617ed7e821a6 (patch)
tree7fa77c3081befea9c0cff4964e30e84352174860
parenta86f61586537ae461fcfa0c3be6687c058ab88bc (diff)
* Fix regression about APT::Get::List-Cleanup setting being ignored,
closes: #466052.
-rw-r--r--apt-pkg/algorithms.cc2
-rw-r--r--configure.in2
-rw-r--r--debian/changelog2
3 files changed, 4 insertions, 2 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/configure.in b/configure.in
index 5f19c98a6..22b373f91 100644
--- 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_DEFINE_UNQUOTED(VERSION,"0.7.10")
+AC_DEFINE_UNQUOTED(VERSION,"0.7.11")
PACKAGE="apt"
AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
AC_SUBST(PACKAGE)
diff --git a/debian/changelog b/debian/changelog
index 8f6de6f25..c4067e5c1 100644
--- 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.
+ * 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