Merge lp:~gothicx/apport/ui_msg_failed_connection into lp:~apport-hackers/apport/trunk

[Marco Rodrigues]

=== modified file 'apport/hookutils.py'
--- apport/hookutils.py	2009-09-03 14:21:12 +0000
+++ apport/hookutils.py	2009-09-08 20:27:57 +0000
@@ -94,8 +94,8 @@
 
     report['Lspci'] = command_output(['lspci','-vvnn'])
     report['Lsusb'] = command_output(['lsusb'])
-    report['UdevDb'] = command_output(['udevadm', 'info', '--export-db'])
-
+    report['UdevDb'] = command_output(['sh', '-c', 'udevadm info --export-db | grep -vi label'])
+    
     dmi_dir = '/sys/class/dmi/id'
     if os.path.isdir(dmi_dir):
         for f in os.listdir(dmi_dir):
 
=== modified file 'apport/ui.py'
--- apport/ui.py	2009-09-08 12:19:02 +0000
+++ apport/ui.py	2009-09-09 09:38:55 +0000
@@ -759,12 +759,9 @@
                                                  args=(self.report,
                                                        progress_callback))
                     upthread.start()
-            except Exception, e:
+            except Exception:
                 self.ui_error_message(_('Network problem'),
-                    '%s:\n\n%s' % (
-                        _('Could not upload report data to crash database'),
-                        str(e)
-                    ))
+             		_('Cannot connect to crash database, please check your Internet connection.'))
                 return
 
         ticket = upthread.return_value()