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

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

a1e68c33ac15be454984b00d62c7fc331bd0b32b
diff --cc apt-pkg/edsp.cc
index 44f7dbfd6,137398100..791aac72f
--- a/apt-pkg/edsp.cc
+++ b/apt-pkg/edsp.cc
@@@ -279,7 -286,7 +286,7 @@@ bool EDSP::ReadResponse(int const input
  			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 --cc debian/changelog
index a06abbbc0,bda786e12..27d1c7c07
--- a/debian/changelog
+++ b/debian/changelog
@@@ -13,12 -44,7 +44,7 @@@ apt (0.8.16~exp7) UNRELEASEDexperimenta
    * ftparchive/cachedb.cc:
      - fix buffersize in bytes2hex
  
-   [ David Kalnischkies ]  
-   * apt-pkg/deb/deblistparser.cc:
-     - fix crash when the dynamic mmap needs to be grown in
-       LoadReleaseInfo (LP: #854090)
- 
-  -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 05 Oct 2011 18:14:11 +0200
 - -- 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