From: Michael Vogt <egon@debian-devbox>
Date: Fri, 14 Oct 2011 11:55:50 +0000 (+0200)
Subject: merged lp:~donkult/apt/experimental
X-Git-Tag: 0.9.0~50
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/a1e68c33ac15be454984b00d62c7fc331bd0b32b?hp=0e7c33134cd32410eb8b344c6b6577826238bbbc

merged lp:~donkult/apt/experimental
---

diff --git a/apt-pkg/edsp.cc b/apt-pkg/edsp.cc
index 137398100..791aac72f 100644
--- a/apt-pkg/edsp.cc
+++ b/apt-pkg/edsp.cc
@@ -286,7 +286,7 @@ bool EDSP::ReadResponse(int const input, pkgDepCache &Cache, OpProgress *Progres
 			std::string msg = SubstVar(SubstVar(section.FindS("Message"), "\n .\n", "\n\n"), "\n ", "\n");
 			if (msg.empty() == true) {
 				msg = _("External solver failed without a proper error message");
-				_error->Error(msg.c_str());
+				_error->Error("%s", msg.c_str());
 			} else
 				_error->Error("External solver failed with: %s", msg.substr(0,msg.find('\n')).c_str());
 			if (Progress != NULL)
diff --git a/debian/changelog b/debian/changelog
index bda786e12..27d1c7c07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -44,7 +44,7 @@ apt (0.8.16~exp7) UNRELEASEDexperimental; urgency=low
   * ftparchive/cachedb.cc:
     - fix buffersize in bytes2hex
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 12 Oct 2011 22:27:18 +0200
+ -- Michael Vogt <mvo@debian.org>  Fri, 14 Oct 2011 13:51:35 +0200
 
 apt (0.8.16~exp6) experimental; urgency=low