restore.py: factor out _restore_property() helper

QubesOS · Feb 24, 2018 · c86b731 · c86b731
1 parent 2ace32b
commit c86b731
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/qubesadmin/backup/restore.py b/qubesadmin/backup/restore.py
@@ -1820,6 +1820,14 @@ def restore_do(self, restore_info):
             self.log.info("-> Please install updates for all the restored "
                           "templates.")
 
+    def _restore_property(self, vm, prop, value):
+        '''Restore a single VM property, logging exceptions'''
+        try:
+            setattr(vm, prop, value)
+        except Exception as err:  # pylint: disable=broad-except
+            self.log.error('Error setting %s.%s to %s: %s',
+                vm.name, prop, value, err)
+
     def _restore_vms_metadata(self, restore_info):
         '''Restore VM metadata
 
@@ -1893,11 +1901,7 @@ def _restore_vms_metadata(self, restore_info):
                 # restore options
                 if prop in ['template', 'netvm', 'default_dispvm']:
                     continue
-                try:
-                    setattr(new_vm, prop, value)
-                except Exception as err:  # pylint: disable=broad-except
-                    self.log.error('Error setting %s.%s to %s: %s',
-                        vm.name, prop, value, err)
+                self._restore_property(new_vm, prop, value)
 
             for feature, value in vm.features.items():
                 try: