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

dom0/qvm-backup-restore: fixes - custom templates, error handling

Browse Source
This commit is contained in:
Marek Marczykowski 2012-02-29 03:33:43 +01:00 committed by Joanna Rutkowska
parent eb64d76115
commit bcff28908b
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dom0/qvm-core/qubesutils.py
View File

@ -627,13 +627,12 @@ def backup_restore_prepare(backup_dir, options = {}, host_collection = None):
if not ((template_vm_on_host is not None) and template_vm_on_host.is_template()): if not ((template_vm_on_host is not None) and template_vm_on_host.is_template()):
# Maybe the (custom) template is in the backup? # Maybe the (custom) template is in the backup?
template_vm_on_backup = backup_collection.get_vm_by_name (templatevm_name) template_vm_on_backup = backup_collection.get_vm_by_name (templatevm_name)
if template_vm_on_backup is None or template_vm_on_backup.is_template(): if template_vm_on_backup is None or not template_vm_on_backup.is_template():
if options['use-default-template']: if options['use-default-template']:
vms_to_restore[vm.name]['template'] = host_collection.get_default_tempate_vm().name vms_to_restore[vm.name]['template'] = host_collection.get_default_template_vm().name
else: else:
vms_to_restore[vm.name]['missing-template'] = True vms_to_restore[vm.name]['missing-template'] = True
vms_to_restore[vm.name]['good-to-go'] = False vms_to_restore[vm.name]['good-to-go'] = False
continue
if vm.netvm_vm is None: if vm.netvm_vm is None:
vms_to_restore[vm.name]['netvm'] = None vms_to_restore[vm.name]['netvm'] = None
@ -656,7 +655,6 @@ def backup_restore_prepare(backup_dir, options = {}, host_collection = None):
else: else:
vms_to_restore[vm.name]['missing-netvm'] = True vms_to_restore[vm.name]['missing-netvm'] = True
vms_to_restore[vm.name]['good-to-go'] = False vms_to_restore[vm.name]['good-to-go'] = False
continue
if 'good-to-go' not in vms_to_restore[vm.name].keys(): if 'good-to-go' not in vms_to_restore[vm.name].keys():
vms_to_restore[vm.name]['good-to-go'] = True vms_to_restore[vm.name]['good-to-go'] = True