Merge lp:~brian-murray/apt/mushed-files into lp:~ubuntu-core-dev/apt/ubuntu

[Brian Murray]

Bug 799127 is an example of many bugs where we can see AptOrdering stuck in DpkgTerminalLog.txt - https://launchpadlibrarian.net/73730089/DpkgTerminalLog.txt. I believe this happens because apport expects keys like 'AptOrdering:' to appear on a new line and AptOrdering is getting put on the same line as text in DpkgTerminalLog. Like so:

invoke-rc.d: initscript postgresql-8.4, action "start" failed.AptOrdering:

We can prevent this by adding in an extra new line after adding the contents of /var/log/apt/term.log as I've done.

=== modified file 'apt-pkg/deb/dpkgpm.cc'
--- apt-pkg/deb/dpkgpm.cc	2011-06-15 21:02:51 +0000
+++ apt-pkg/deb/dpkgpm.cc	2011-06-24 01:02:33 +0000
@@ -1442,6 +1442,7 @@
       {
 	 while( fgets(buf, sizeof(buf), log) != NULL)
 	    fprintf(report, " %s", buf);
+	    fprintf(report, " \n");
 	 fclose(log);
       }
    }

=== modified file 'debian/changelog'
--- debian/changelog	2011-06-15 21:02:51 +0000
+++ debian/changelog	2011-06-24 01:02:33 +0000
@@ -8,6 +8,9 @@
   * apt-pkg/deb/dpkgpm.cc:
     - updated allocate memory string
     - cannot access archive string is lowercase
+  * apt-pkg/deb/dpkgpm.cc:
+    - resolve issue where AptOrdering is included in DpkgTerminalLog in apport
+      attachments
 
  -- Brian Murray <[e-mail]>  Wed, 15 Jun 2011 14:00:43 -0700