diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2008-08-11 19:40:57 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2008-08-11 19:40:57 +0200 |
| commit | 5279f566ec5bba9f5003440ecc575dc4d32b756b (patch) | |
| tree | c7d744593ec24d822f6f627f86c47d055ffaa3b2 /apt-pkg/deb/dpkgpm.cc | |
| parent | d6a4afcb1b937e07aaf186346f064833f65acfbd (diff) | |
support a ":" in the dpkg error output
Diffstat (limited to 'apt-pkg/deb/dpkgpm.cc')
| -rw-r--r-- | apt-pkg/deb/dpkgpm.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 08291854f..8c353a9d9 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -341,7 +341,7 @@ void pkgDPkgPM::ProcessDpkgStatusLine(int OutStatusFd, char *line) 'processing: trigproc: trigger' */ - char* list[5]; + char* list[6]; // dpkg sends multiline error messages sometimes (see // #374195 for a example. we should support this by // either patching dpkg to not send multiline over the @@ -390,10 +390,10 @@ void pkgDPkgPM::ProcessDpkgStatusLine(int OutStatusFd, char *line) // urgs, sometime has ":" in its error string so that we // end up with the error message split between list[3] // and list[4], e.g. the message: - // failed in buffer_write(fd) (10, ret=-1): backend dpkg-deb ... + // "failed in buffer_write(fd) (10, ret=-1): backend dpkg-deb ..." // concat them again - if( list[4] != NULL) - list[4][-1] = ':'; + if( list[4] != NULL ) + list[3][strlen(list[3])] = ':'; status << "pmerror:" << list[1] << ":" << (PackagesDone/float(PackagesTotal)*100.0) |