commit e3d585529b3a2aaf5b3d3fc953b22699987b2b25
author Richard Frankel <rofrankel@google.com> Tue Sep 27 18:26:46 2016 -0400
committer Richard Frankel <rofrankel@google.com> Tue Sep 27 19:03:34 2016 -0400
tree ae16b3a76d06e0cc764b8875a858dc1595ab2419
parent 1fc565a8aeb84a643dfcadb8784b5577d8e5811c

conman:  handle wpactrl OSErrors.

As of go/fibercl/78660 (buildroot commit 53191d0), wpactrl may raise
OSError in addition to wpactrl.error.  conman needs to catch those.

Change-Id: I819bd2c90c4e7a6c25210474f69f0dea689f3757

conman/interface.py

diff --git a/conman/interface.py b/conman/interface.py
index b20709a..6557049 100755
--- a/conman/interface.py
+++ b/conman/interface.py
@@ -470,7 +470,7 @@
       self._wpa_control = self.get_wpa_control(socket)
       self._wpa_control.attach()
       logging.debug('%s successfully attached', self.name)
-    except wpactrl.error as e:
+    except (wpactrl.error, OSError) as e:
       logging.error('Error attaching to wpa_supplicant: %s', e)
       return False
 
@@ -497,7 +497,7 @@
       lines = []
       try:
         lines = self._wpa_control.request('STATUS').splitlines()
-      except wpactrl.error as e:
+      except (wpactrl.error, OSError) as e:
         logging.error('wpa_control STATUS request failed %s args %s',
                       e.message, e.args)
         lines = self.wpa_cli_status().splitlines()
@@ -517,7 +517,7 @@
     if self.attached():
       try:
         self._wpa_control.detach()
-      except wpactrl.error:
+      except (wpactrl.error, OSError):
         logging.error('Failed to detach from wpa_supplicant interface. This '
                       'may mean something else killed wpa_supplicant.')
         self._wpa_control = None