merged lp:~donkult/apt/experimental

diff --git a/apt-pkg/edsp.cc b/apt-pkg/edsp.cc
index 137398100673154eba3dd318f028c73a1a483ee8..791aac72f416364f149d133074e4fbf1747e93fb 100644 (file)
--- 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 bda786e12a2d9a1df8325d1f495572378456a47f..27d1c7c07825e66664bfda7fe2049c573562030b 100644 (file)
--- 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