Browse Source

* Fix compilation warnings in apt-pkg/cdrom.cc and

apt-pkg/contrib/configuration.cc.
debian/1.8.y
Otavio Salvador 15 years ago
parent
commit
a376d6fdfe
  1. 4
      apt-pkg/cdrom.cc
  2. 2
      apt-pkg/contrib/configuration.cc
  3. 4
      debian/changelog

4
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);

2
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);

4
debian/changelog

@ -23,6 +23,8 @@ apt (0.7.10) UNRELEASED; urgency=low
closes: #438136.
* Fix cron.daily job to not call fail if apt isn't installed, closes:
#443286.
* Fix compilation warnings in apt-pkg/cdrom.cc and
apt-pkg/contrib/configuration.cc.
[ Program translations ]
- Basque updated. Closes: #453088
@ -59,7 +61,7 @@ apt (0.7.10) UNRELEASED; urgency=low
* Fix wording for "After unpacking...". Thans to Michael Gilbert
for the patch. Closes: #260825
-- Christian Perrier <bubulle@debian.org> Mon, 17 Dec 2007 10:10:17 +0530
-- Otavio Salvador <otavio@debian.org> Thu, 27 Dec 2007 15:04:23 -0200
apt (0.7.9) unstable; urgency=low

Loading…
Cancel
Save