diff options
| author | Michael Vogt <mvo@debian.org> | 2013-10-15 17:54:31 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-10-15 17:54:31 +0200 |
| commit | 6b164ba3fa36e0df2bc146b399af9853a8b05f2a (patch) | |
| tree | 20a7e85b7e5405bfaf9de58cc60e85c6b0ab2202 /apt-pkg | |
| parent | fd6417a6026401f95af82608e12b4a9d105b090f (diff) | |
| parent | 7794a6880e74446075d9cae19525829ada5b0d91 (diff) | |
Merge remote-tracking branch 'upstream/debian/sid' into bugfix/bts-726156-2
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/deb/dpkgpm.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 61d8eec02..d18900b9c 100644 --- 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; |