diff options
author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-08-01 15:45:39 +0200 |
---|---|---|
committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-08-01 15:45:39 +0200 |
commit | c8d80b1d346c9c24f897813d5793e69bb59e465b (patch) | |
tree | 97fb9ca12c7de03839483e2998559d3f409871c9 /apt-pkg/deb/dpkgpm.cc | |
parent | 585b14f578b3f21d88e2c8f884df6468b5e0655f (diff) | |
parent | 80e2662eee5ac39d1dd402dd082d79be891dd98c (diff) |
* merged with mainline
Diffstat (limited to 'apt-pkg/deb/dpkgpm.cc')
-rw-r--r-- | apt-pkg/deb/dpkgpm.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 667db8ff2..bf0434ccc 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -624,7 +624,13 @@ bool pkgDPkgPM::Go(int OutStatusFd) */ char* list[5]; - TokSplitString(':', line, list, sizeof(list)/sizeof(list[0])); + if(!TokSplitString(':', line, list, sizeof(list)/sizeof(list[0]))) + // FIXME: 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 + // statusfd or by rewriting the code here to deal with + // it. for now we just ignore it and not crash + continue; char *pkg = list[1]; char *action = _strstrip(list[2]); |