Merge lp:~smoser/ubuntu/lucid/apport/bug-486122 into lp:~ubuntu-core-dev/ubuntu/lucid/apport/ubuntu

[Scott Moser]

Fix for bug 486122.

[Martin Pitt (pitti)]

I applied your patch to trunk (r1734) with two tiny stylistic corrections, thanks a lot!

Thus I couldn't technically merge your branch, since it's not mergeable to trunk.

review: Approve

=== modified file 'bin/apport-cli'
--- bin/apport-cli	2009-12-23 10:55:52 +0000
+++ bin/apport-cli	2010-03-18 19:22:25 +0000
@@ -189,22 +189,18 @@
         # Fallback
         return 'cancel'
 
-    def ui_present_report_details(self, is_update):
-        if is_update:
-            dialog = CLIDialog (_('Send this data to the developers?'), None)
-        else:
-            dialog = CLIDialog (_('Send problem report to the developers?'), 
-                    _('After the problem report has been sent, please fill out the form in the\n'
-                      'automatically opened web browser.'))
-
+    def ui_get_details(self):
         # report contents
         details = ''
+        max_show = 1024 * 1024
         for key in self.report:
             details += key + ':'
             # string value
+            keylen = len(self.report[key])
             if not hasattr(self.report[key], 'gzipvalue') and \
                 hasattr(self.report[key], 'isspace') and \
-                not self.report._is_binary(self.report[key]):
+                not self.report._is_binary(self.report[key]) and \
+                keylen < max_show:
                 lines = self.report[key].splitlines()
                 if len(lines) <= 1:
                     details += ' ' + self.report[key] + '\n'
@@ -212,9 +208,22 @@
                     details += '\n'
                     for line in lines:
                         details += '  ' + line + '\n'
+            elif keylen >= max_show:
+                details += ' ' + (_('(%s bytes)') % keylen ) + '\n'
             else:
                 details += ' ' + _('(binary data)') + '\n'
 
+        return details
+
+
+    def ui_present_report_details(self, is_update):
+        if is_update:
+            dialog = CLIDialog (_('Send this data to the developers?'), None)
+        else:
+            dialog = CLIDialog (_('Send problem report to the developers?'), 
+                    _('After the problem report has been sent, please fill out the form in the\n'
+                      'automatically opened web browser.'))
+
         # complete/reduced reports
         if self.report.has_key('CoreDump') and self.report.has_useful_stacktrace():
             complete = dialog.addbutton(_('&Send complete report (recommended; %s)') %
@@ -242,7 +251,7 @@
                 try:
                     subprocess.Popen(["/usr/bin/sensible-pager"],
                             stdin=subprocess.PIPE,
-                            close_fds=True).communicate(details)
+                            close_fds=True).communicate(self.ui_get_details())
                 except IOError, e:
                     # ignore broken pipe (premature quit)
                     if e.errno == errno.EPIPE:
@@ -396,7 +405,7 @@
             _('You can launch a browser now, or copy this URL into a browser on another computer.'))
 
         answer = self.ui_question_choice(text, [_('Launch a browser now')], False)
-	if answer == [0]:
+        if answer == [0]:
             apport.ui.UserInterface.open_url(self, url)
 
 if __name__ == '__main__':