Apport

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

  1. ui_msg_failed_connection
  2. Merge into trunk
Proposed by Marco Rodrigues
Status: Merged
Merged at revision: not available
Proposed branch: lp:~gothicx/apport/ui_msg_failed_connection
Merge into: lp:~apport-hackers/apport/trunk
Diff against target: None lines
To merge this branch: bzr merge lp:~gothicx/apport/ui_msg_failed_connection
Reviewer Review Type Date Requested Status
Apport upstream developers Pending
Review via email: mp+11422@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'apport/hookutils.py'
2--- apport/hookutils.py 2009-09-03 14:21:12 +0000
3+++ apport/hookutils.py 2009-09-08 20:27:57 +0000
4@@ -94,8 +94,8 @@
5
6 report['Lspci'] = command_output(['lspci','-vvnn'])
7 report['Lsusb'] = command_output(['lsusb'])
8- report['UdevDb'] = command_output(['udevadm', 'info', '--export-db'])
9-
10+ report['UdevDb'] = command_output(['sh', '-c', 'udevadm info --export-db | grep -vi label'])
11+
12 dmi_dir = '/sys/class/dmi/id'
13 if os.path.isdir(dmi_dir):
14 for f in os.listdir(dmi_dir):
15
16=== modified file 'apport/ui.py'
17--- apport/ui.py 2009-09-08 12:19:02 +0000
18+++ apport/ui.py 2009-09-09 09:38:55 +0000
19@@ -759,12 +759,9 @@
20 args=(self.report,
21 progress_callback))
22 upthread.start()
23- except Exception, e:
24+ except Exception:
25 self.ui_error_message(_('Network problem'),
26- '%s:\n\n%s' % (
27- _('Could not upload report data to crash database'),
28- str(e)
29- ))
30+ _('Cannot connect to crash database, please check your Internet connection.'))
31 return
32
33 ticket = upthread.return_value()

Subscribers

People subscribed via source and target branches