summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2008-02-21 16:46:31 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2008-02-21 16:46:31 +0100
commit7810fc042d4d3dda6b2c721d09d3eb7eadc12e2d (patch)
tree243a6de124c8a38e106015bf78dd3e5c70e22bc4 /apt-pkg
parentbd668fbb93a536135f8a001f98a7485158a5075f (diff)
parente3a1f08d41bf6ef6a42bbc6e5f8e20f7b4aa37a0 (diff)
* Fix typos in manpages. Thanks to Daniel Leidert for the fixes
Closes: #444922 [ Raise urgency to critical since it fixes a critical but for Debian Installer Lenny Beta1 release ] - Vietnamese updated. Closes: #460825 - Basque updated. Closes: #461166 - Galician updated. Closes: #461468 - Portuguese updated. Closes: #464575 - Korean updated. Closes: #448430 - Simplified Chinese updated. Closes: #465866 * 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. * Fix compilation warnings in apt-pkg/cdrom.cc and apt-pkg/contrib/configuration.cc. * Fix typo in debian/copyright file ("licened" instead of "licensed"), closes: #458966. - Vietnamese updated. Closes: #453774, #459013 - Simplified Chinese updated. Closes: #458039 - Norwegian Bokmål updated. Closes: #457917 * Fix wording for "After unpacking...". Thanks to Michael Gilbert
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/cdrom.cc4
-rw-r--r--apt-pkg/contrib/configuration.cc2
2 files changed, 3 insertions, 3 deletions
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);