From c28f50f6fe54cd40eec72d4c130f7248e96c6ba5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Tue, 5 Apr 2016 00:35:57 +0200 Subject: [PATCH] backup: minor fixes --- qubes/backup.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/qubes/backup.py b/qubes/backup.py index fa3be91b..506ed63e 100644 --- a/qubes/backup.py +++ b/qubes/backup.py @@ -1795,7 +1795,8 @@ class BackupRestore(object): if not (template_name in restore_info.keys() and restore_info[template_name].good_to_go and restore_info[template_name].vm.is_template()): - if self.options.use_default_template: + if self.options.use_default_template and \ + self.app.default_template: if vm_info.orig_template is None: vm_info.orig_template = template_name vm_info.template = self.app.default_template.name @@ -1813,12 +1814,12 @@ class BackupRestore(object): netvm_on_host = None # No netvm on the host? if not ((netvm_on_host is not None) - and netvm_on_host.is_netvm()): + and netvm_on_host.provides_network): # Maybe the (custom) netvm is in the backup? if not (netvm_name in restore_info.keys() and restore_info[netvm_name].good_to_go and - restore_info[netvm_name].vm.is_netvm()): + restore_info[netvm_name].vm.provides_network): if self.options.use_default_netvm: vm_info.vm.netvm = qubes.property.DEFAULT elif self.options.use_none_netvm: