Apport

Merge lp:~cyphermox/apport/attach_wifi_regex into lp:~apport-hackers/apport/trunk

  1. attach_wifi_regex
  2. Merge into trunk
Proposed by Mathieu Trudel-Lapierre
Status: Merged
Merged at revision: 1869
Proposed branch: lp:~cyphermox/apport/attach_wifi_regex
Merge into: lp:~apport-hackers/apport/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
apport/hookutils.py (+1/-1)
To merge this branch: bzr merge lp:~cyphermox/apport/attach_wifi_regex
Reviewer Review Type Date Requested Status
Martin Pitt (community) Approve
Review via email: mp+52939@code.launchpad.net

Description of the change

Fixes the regex to correctly catch NetworkManager, modem-manager, etc. with the PID included in syslog entries.

To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'apport/hookutils.py'
--- apport/hookutils.py 2011-02-28 10:58:32 +0000
+++ apport/hookutils.py 2011-03-10 22:32:52 +0000
@@ -468,7 +468,7 @@
468def attach_wifi(report):468def attach_wifi(report):
469 '''Attach wireless (WiFi) network information to report.'''469 '''Attach wireless (WiFi) network information to report.'''
470470
471 report['WifiSyslog'] = recent_syslog(re.compile(r'(NetworkManager|modem-manager|dhclient|kernel):'))471 report['WifiSyslog'] = recent_syslog(re.compile(r'(NetworkManager|modem-manager|dhclient|kernel)(\[\d+\])?:'))
472 report['IwConfig'] = re.sub('Encryption key:(.*)', 'Encryption key: <hidden>', command_output(['iwconfig']))472 report['IwConfig'] = re.sub('Encryption key:(.*)', 'Encryption key: <hidden>', command_output(['iwconfig']))
473 report['RfKill'] = command_output(['rfkill', 'list'])473 report['RfKill'] = command_output(['rfkill', 'list'])
474 report['CRDA'] = command_output(['iw', 'reg', 'get'])474 report['CRDA'] = command_output(['iw', 'reg', 'get'])

Subscribers

People subscribed via source and target branches