Merge remote-tracking branch 'origin/pr/156'

* origin/pr/156:
  Added more resilience to missing permissions to utils
This commit is contained in:
Marek Marczykowski-Górecki 2020-08-11 18:41:55 +02:00
commit a7748d8cdf
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724

View File

@ -144,8 +144,13 @@ def vm_dependencies(app, reference_vm):
if vm == reference_vm:
continue
for prop in vm_properties:
if reference_vm == getattr(vm, prop, None) and \
not vm.property_is_default(prop):
if not hasattr(vm, prop):
continue
try:
is_prop_default = vm.property_is_default(prop)
except qubesadmin.exc.QubesPropertyAccessError:
is_prop_default = False
if reference_vm == getattr(vm, prop, None) and not is_prop_default:
result.append((vm, prop))
return result