Merge remote-tracking branch 'upstream/debian/sid' into bugfix/bts-726156-2

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 61d8eec02962671b7188fdfb87e0f0e182aff941..d18900b9c0fa3ef4149bc557988191e26cff873f 100644 (file)
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -546,8 +546,8 @@ void pkgDPkgPM::ProcessDpkgStatusLine(int OutStatusFd, char *line)
    // A dpkg error message may contain additional ":" (like
    //  "failed in buffer_write(fd) (10, ret=-1): backend dpkg-deb ..."
    // so we need to ensure to not split too much
-   std::vector<std::string> list = StringSplit(line, ": ", 3);
-   if(list.size() != 3)
+   std::vector<std::string> list = StringSplit(line, ": ", 4);
+   if(list.size() < 3)
    {
       if (Debug == true)
         std::clog << "ignoring line: not enough ':'" << std::endl;
@@ -916,7 +916,7 @@ void pkgDPkgPM::SendTerminalProgress(float percentage)
       return;
 
    std::string progress_str;
-   strprintf(progress_str, "Progress: [%3i%%]", (int)percentage);
+   strprintf(progress_str, _("Progress: [%3i%%]"), (int)percentage);
    if (d->fancy_progress_output)
    {
          int row = d->nr_terminal_rows;