* merged from the apt--install-recommends branch

[apt.git] / apt-pkg / deb / dpkgpm.cc

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 667db8ff2d98f4da38ae95d1416ec55c89f874c2..93dff390d83c4fd37bf189c09e46c54757ede2a4 100644 (file)
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -474,6 +474,8 @@ bool pkgDPkgPM::Go(int OutStatusFd)
         case Item::Install:
         Args[n++] = "--unpack";
         Size += strlen(Args[n-1]);
+        Args[n++] = "--auto-deconfigure";
+        Size += strlen(Args[n-1]);
         break;
       }
       
@@ -624,7 +626,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]);