Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

devices: better handle exceptions in device extension

Browse Source 
Do not fail app.save() just because listing devices failed, for any
reason.
This commit is contained in:
Marek Marczykowski-Górecki 2017-07-03 23:08:04 +02:00
parent 77e84b9ce4
commit e5de8f4115
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qubes/devices.py
View File

@ -241,8 +241,17 @@ class DeviceCollection(object):
attached persistently. attached persistently.
''' '''
devices = self._vm.fire_event('device-list-attached:' + self._bus, try:
persistent=persistent) devices = self._vm.fire_event('device-list-attached:' + self._bus,
persistent=persistent)
except Exception as e: # pylint: disable=broad-except
self._vm.log.exception(e, 'Failed to list {} devices'.format(
self._bus))
if persistent is True:
# don't break app.save()
return self._set
else:
raise
result = set() result = set()
for dev, options in devices: for dev, options in devices:
if dev in self._set and not persistent: if dev in self._set and not persistent: