Browse Source

LP: #263089

debian/1.8.y
Michael Vogt 14 years ago
parent
commit
236527f0ff
  1. 10
      apt-pkg/deb/debsystem.cc
  2. 2
      cmdline/apt-get.cc
  3. 2
      debian/changelog
  4. 2
      methods/gpgv.cc

10
apt-pkg/deb/debsystem.cc

@ -18,7 +18,7 @@
#include <apt-pkg/error.h>
#include <apt-pkg/fileutl.h>
#include <apti18n.h>
#include <sys/types.h>
#include <unistd.h>
#include <dirent.h>
@ -67,11 +67,11 @@ bool debSystem::Lock()
if (LockFD == -1)
{
if (errno == EACCES || errno == EAGAIN)
return _error->Error("Unable to lock the administration directory (%s), "
"is another process using it?",AdminDir.c_str());
return _error->Error(_("Unable to lock the administration directory (%s), "
"is another process using it?"),AdminDir.c_str());
else
return _error->Error("Unable to lock the administration directory (%s), "
"are you root?",AdminDir.c_str());
return _error->Error(_("Unable to lock the administration directory (%s), "
"are you root?"),AdminDir.c_str());
}
// See if we need to abort with a dirty journal

2
cmdline/apt-get.cc

@ -1297,7 +1297,7 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
// show name mismatches
if (IsMatch == true && Parse->Package() != Src)
ioprintf(c1out, _("No source package '%s' picking '%s' instead"), Parse->Package(), Src);
ioprintf(c1out, _("No source package '%s' picking '%s' instead"), Parse->Package().c_str(), Src.c_str());
if (VerTag.empty() == false)
{

2
debian/changelog

@ -9,6 +9,8 @@ apt (0.7.19ubuntu3) jaunty; urgency=low
* debian/apt.conf.autoremove:
- readd "linux-image" (and friends) to the auto-remove
blacklist
* fix some i18n issues (thanks to Gabor Kelemen)
LP: #263089
[ Christian Perrier ]
* Translations:

2
methods/gpgv.cc

@ -264,7 +264,7 @@ bool GPGVMethod::Fetch(FetchItem *Itm)
// least one bad signature. good signatures and NoPubKey signatures
// happen easily when a file is signed with multiple signatures
if(GoodSigners.empty() or !BadSigners.empty())
return _error->Error(errmsg.c_str());
return _error->Error("%s", errmsg.c_str());
}
// Just pass the raw output up, because passing it as a real data

Loading…
Cancel
Save