apport-hackers team mailing list archive

[Brian Murray <brian@xxxxxxxxxx>]

Brian Murray has proposed merging lp:~brian-murray/apport/shorten-CRDA-output into lp:apport.

Requested reviews:
  Apport upstream developers (apport-hackers)

For more details, see:
https://code.launchpad.net/~brian-murray/apport/shorten-CRDA-output/+merge/265020

Instead of displaying:

CRDA 	
Error: [Errno 2] No such file or directory: 'iw'

Let's just display N/A.
-- 
Your team Apport upstream developers is requested to review the proposed merge of lp:~brian-murray/apport/shorten-CRDA-output into lp:apport.

=== modified file 'apport/hookutils.py'
--- apport/hookutils.py	2015-03-02 10:19:47 +0000
+++ apport/hookutils.py	2015-07-16 16:26:29 +0000
@@ -661,7 +661,11 @@
                re.sub('Access Point: (.*)', 'Access Point: <hidden>',
                       command_output(['iwconfig']))))
     report['RfKill'] = command_output(['rfkill', 'list'])
-    report['CRDA'] = command_output(['iw', 'reg', 'get'])
+    if os.path.exists('/sbin/iw'):
+        iw_output = command_output(['iw', 'reg', 'get'])
+    else:
+        iw_output = "N/A"
+    report['CRDA'] = iw_output
 
     attach_file_if_exists(report, '/var/log/wpa_supplicant.log', key='WpaSupplicantLog')