From a376d6fdfe2f01cddd980fb14f53a3d4580d4779 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 27 Dec 2007 15:04:42 -0200 Subject: * Fix compilation warnings in apt-pkg/cdrom.cc and apt-pkg/contrib/configuration.cc. --- apt-pkg/cdrom.cc | 4 ++-- apt-pkg/contrib/configuration.cc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'apt-pkg') diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index 0cbdc178f..370687f24 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -675,8 +675,8 @@ bool pkgCdrom::Add(pkgCdromStatus *log) DropRepeats(TransList,""); if(log) { msg.str(""); - ioprintf(msg, _("Found %u package indexes, %u source indexes, " - "%u translation indexes and %u signatures\n"), + ioprintf(msg, _("Found %zu package indexes, %zu source indexes, " + "%zu translation indexes and %zu signatures\n"), List.size(), SourceList.size(), TransList.size(), SigList.size()); log->Update(msg.str(), STEP_SCAN); diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index e8301d918..da57c2054 100644 --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@ -512,7 +512,7 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool AsSectional, CurLine++; // This should be made to work instead, but this is better than looping if (F.fail() && !F.eof()) - return _error->Error(_("Line %d too long (max %u)"), CurLine, sizeof(Buffer)); + return _error->Error(_("Line %d too long (max %lu)"), CurLine, sizeof(Buffer)); _strtabexpand(Buffer,sizeof(Buffer)); _strstrip(Buffer); -- cgit v1.2.3-70-g09d2 From a1704ec47a2f82516586351bf801617ed7e821a6 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 16 Feb 2008 20:22:20 -0200 Subject: * Fix regression about APT::Get::List-Cleanup setting being ignored, closes: #466052. --- apt-pkg/algorithms.cc | 2 +- configure.in | 2 +- debian/changelog | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'apt-pkg') 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 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 Thu, 17 Jan 2008 22:36:46 -0200 -- cgit v1.2.3-70-g09d2