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

Fixed inability to select which VMs to restore

Browse Source 
Fixed bug that caused all VMs to be restored, regardless of what the
user selected.
This commit is contained in:
Marta Marczykowska-Górecka 2017-12-10 23:56:22 +01:00
parent 7bcde2158e
commit 7848b6b2c3
No known key found for this signature in database
GPG Key ID: 9A752C30B26FD04B
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
qubesmanager/restore.py
View File

@ -64,8 +64,6 @@ class RestoreVMsWindow(ui_restoredlg.Ui_Restore, QtGui.QWizard):
self.tmpdir_to_remove = None self.tmpdir_to_remove = None
self.error_detected = Event() self.error_detected = Event()
self.excluded = {}
self.setupUi(self) self.setupUi(self)
self.select_vms_widget = multiselectwidget.MultiSelectWidget(self) self.select_vms_widget = multiselectwidget.MultiSelectWidget(self)
@ -95,7 +93,6 @@ class RestoreVMsWindow(ui_restoredlg.Ui_Restore, QtGui.QWizard):
QtCore.SIGNAL("completeChanged()")) QtCore.SIGNAL("completeChanged()"))
backup_utils.fill_appvms_list(self) backup_utils.fill_appvms_list(self)
# self.__init_restore_options__()
@QtCore.pyqtSlot(name='on_select_path_button_clicked') @QtCore.pyqtSlot(name='on_select_path_button_clicked')
def select_path_button_clicked(self): def select_path_button_clicked(self):
@ -214,21 +211,20 @@ class RestoreVMsWindow(ui_restoredlg.Ui_Restore, QtGui.QWizard):
self.__fill_vms_list__() self.__fill_vms_list__()
elif self.currentPage() is self.confirm_page: elif self.currentPage() is self.confirm_page:
for v in self.excluded:
self.vms_to_restore[v] = self.excluded[v] self.vms_to_restore = self.backup_restore.get_restore_info()
self.excluded = {}
for i in range(self.select_vms_widget.available_list.count()): for i in range(self.select_vms_widget.available_list.count()):
vmname = self.select_vms_widget.available_list.item(i).text() vmname = self.select_vms_widget.available_list.item(i).text()
self.excluded[str(vmname)] = self.vms_to_restore[str(vmname)]
del self.vms_to_restore[str(vmname)] del self.vms_to_restore[str(vmname)]
del self.func_output[:]
# TODO: am I ignoring changes made by user?
self.vms_to_restore = self.backup_restore.restore_info_verify( self.vms_to_restore = self.backup_restore.restore_info_verify(
self.backup_restore.get_restore_info()) self.vms_to_restore)
self.func_output = self.backup_restore.get_restore_summary( self.func_output = self.backup_restore.get_restore_summary(
self.backup_restore.get_restore_info() self.vms_to_restore
) )
self.confirm_text_edit.setReadOnly(True) self.confirm_text_edit.setReadOnly(True)
self.confirm_text_edit.setFontFamily("Monospace") self.confirm_text_edit.setFontFamily("Monospace")
self.confirm_text_edit.setText(self.func_output) self.confirm_text_edit.setText(self.func_output)
@ -243,7 +239,7 @@ class RestoreVMsWindow(ui_restoredlg.Ui_Restore, QtGui.QWizard):
.count("media/") > 0) .count("media/") > 0)
self.thread_monitor = thread_monitor.ThreadMonitor() self.thread_monitor = thread_monitor.ThreadMonitor()
thread = threading.Thread (target= self.__do_restore__, args=(self.thread_monitor,)) thread = threading.Thread (target=self.__do_restore__, args=(self.thread_monitor,))
thread.daemon = True thread.daemon = True
thread.start() thread.start()