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

qvm-device: improve error message on invalid device type

Browse Source 
Fixes QubesOS/qubes-issues#6057
This commit is contained in:
Marek Marczykowski-Górecki 2020-09-16 13:34:56 +02:00
parent e6186239ef
commit 07dfe826f7
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
qubesadmin/tools/qvm_device.py
View File

@ -81,17 +81,22 @@ def list_devices(args):
app = args.app app = args.app
devices = set() devices = set()
if hasattr(args, 'domains') and args.domains: try:
for domain in args.domains: if hasattr(args, 'domains') and args.domains:
for dev in domain.devices[args.devclass].attached(): for domain in args.domains:
devices.add(dev) for dev in domain.devices[args.devclass].attached():
for dev in domain.devices[args.devclass].available(): devices.add(dev)
devices.add(dev) for dev in domain.devices[args.devclass].available():
devices.add(dev)
else: else:
for domain in app.domains: for domain in app.domains:
for dev in domain.devices[args.devclass].available(): for dev in domain.devices[args.devclass].available():
devices.add(dev) devices.add(dev)
except qubesadmin.exc.QubesDaemonAccessError:
raise qubesadmin.exc.QubesException(
"Failed to list '%s' devices, this device type either "
"does not exist or you do not have access to it.", args.devclass)
result = {dev: Line(dev) for dev in devices} result = {dev: Line(dev) for dev in devices}