From 933e2d62a5546fdf92b46a9eb4f9f45075c28d52 Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Aug 11 2017 15:51:45 +0000 Subject: utils: Also catch OSError in case directories disappear --- diff --git a/fed_laptoptest/utils/usb.py b/fed_laptoptest/utils/usb.py index 2b18364..7390a6e 100644 --- a/fed_laptoptest/utils/usb.py +++ b/fed_laptoptest/utils/usb.py @@ -200,7 +200,6 @@ class USBDevice(USBSlot): self.idVendor = int(list(self.sysfsdata('idVendor'))[-1], 16) try: - raise IOError() self.product = list(self.sysfsdata('product'))[-1] except IOError: self.product = find_usb_prod(self.idVendor, self.idProduct) @@ -317,6 +316,8 @@ class USBHub(USBDevice): slot = dev except IOError: pass + except OSError: + pass self._ports.append(slot) @@ -379,6 +380,8 @@ def get_roots(): yield USBRoot(sorted(busses)) except IOError: pass + except OSError: + pass if __name__ == '__main__': for root in get_roots():