Qubes/manager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

backups: improve error reporting during restore

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2013-11-29 03:33:17 +01:00
parent 668bb1fdf6
commit 568ce68ca5
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
qubesmanager/restore.py
View File

@ -129,22 +129,25 @@ class RestoreVMsWindow(Ui_Restore, QWizard):
self.target_appvm = self.qvm_collection.get_vm_by_name( self.target_appvm = self.qvm_collection.get_vm_by_name(
str(self.appvm_combobox.currentText())) str(self.appvm_combobox.currentText()))
self.restore_tmpdir, qubes_xml = backup.backup_restore_header( try:
str(self.backup_location), self.restore_tmpdir, qubes_xml = backup.backup_restore_header(
str(self.passphrase_line_edit.text()), str(self.backup_location),
encrypted=self.encryption_checkbox.isChecked(), str(self.passphrase_line_edit.text()),
appvm=self.target_appvm) encrypted=self.encryption_checkbox.isChecked(),
self.vms_to_restore = backup.backup_restore_prepare( appvm=self.target_appvm)
str(self.backup_location), self.vms_to_restore = backup.backup_restore_prepare(
os.path.join(self.restore_tmpdir, qubes_xml), str(self.backup_location),
str(self.passphrase_line_edit.text()), os.path.join(self.restore_tmpdir, qubes_xml),
options=self.restore_options, str(self.passphrase_line_edit.text()),
host_collection=self.qvm_collection, options=self.restore_options,
encrypt=self.encryption_checkbox.isChecked(), host_collection=self.qvm_collection,
appvm=self.target_appvm) encrypt=self.encryption_checkbox.isChecked(),
appvm=self.target_appvm)
for vmname in self.vms_to_restore: for vmname in self.vms_to_restore:
self.select_vms_widget.available_list.addItem(vmname) self.select_vms_widget.available_list.addItem(vmname)
except QubesException as ex:
QMessageBox.warning (None, "Restore error!", str(ex))
def __init_restore_options__(self): def __init_restore_options__(self):
if not self.restore_options: if not self.restore_options: