Browse Source

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

* origin/pr/156:
  Added more resilience to missing permissions to utils
Marek Marczykowski-Górecki 3 years ago
parent
commit
a7748d8cdf
1 changed files with 7 additions and 2 deletions
  1. 7 2
      qubesadmin/utils.py

+ 7 - 2
qubesadmin/utils.py

@@ -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