diff options
| author | bubulle@debian.org <> | 2006-11-04 08:34:18 +0100 |
|---|---|---|
| committer | bubulle@debian.org <> | 2006-11-04 08:34:18 +0100 |
| commit | 34d564620d801e912b636161ab0f24df0afd102c (patch) | |
| tree | 04c30e44725817e98e7d2fbde976e3a3593fd17e /apt-pkg/deb/dpkgpm.cc | |
| parent | 57c79e6b0e952f770a6c5d56fa6e23d6fde6a8c0 (diff) | |
| parent | 7882f8fed5bc1232ec51b54b06bf86bfad3d4e18 (diff) | |
Sync with Michael
Temporary compeltion for Greek (needs translator attention)
Diffstat (limited to 'apt-pkg/deb/dpkgpm.cc')
| -rw-r--r-- | apt-pkg/deb/dpkgpm.cc | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 2b167dbf6..c7a6b921f 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -624,15 +624,22 @@ bool pkgDPkgPM::Go(int OutStatusFd) */ char* list[5]; - 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; + // 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 + TokSplitString(':', line, list, sizeof(list)/sizeof(list[0])); char *pkg = list[1]; char *action = _strstrip(list[2]); + if( pkg == NULL || action == NULL) + { + if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) + std::clog << "ignoring line: not enough ':'" << std::endl; + // reset the line buffer + line[0]=0; + continue; + } if(strncmp(action,"error",strlen("error")) == 0) { |