commit 01bdaa1b681cede5e958d2c3e4ca0d6e7fae5a0c
author Richard Frankel <rofrankel@google.com> Fri Jun 17 20:54:52 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jun 17 20:54:52 2016 +0000
tree d63b5273d834f694db5541acf9317ccb3ecd2e85
parent 7ebd372f5cdd3fa61051545a524bda6537c65da8
parent b333214e64a32a7a24369b6646031e7af3d84bd4

Merge "/bin/wifi:  /bin/serial call may fail."

wifi/wifi.py

diff --git a/wifi/wifi.py b/wifi/wifi.py
index 5531eee..241d626 100755
--- a/wifi/wifi.py
+++ b/wifi/wifi.py
@@ -1014,9 +1014,14 @@
   """
   global lockfile_taken
 
+  serial = 'UNKNOWN'
+  try:
+    serial = subprocess.check_output(('serial')).strip()
+  except subprocess.CalledProcessError:
+    utils.log('Could not get serial number')
+
   optspec = _OPTSPEC_FORMAT.format(
-      bin=__file__.split('/')[-1],
-      ssid='%s_TestWifi' % subprocess.check_output(('serial')).strip())
+      bin=__file__.split('/')[-1], ssid='%s_TestWifi' % serial)
   parser = options.Options(optspec)
   opt, _, extra = parser.parse(argv)
   stringify_options(opt)