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

Merge remote-tracking branch 'origin/pr/163'

Browse Source 
* origin/pr/163:
  fix incorrect behavior after backup error
This commit is contained in:
Marek Marczykowski-Górecki 2019-03-23 03:25:20 +01:00
commit 26462a32ab
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qubesmanager/backup.py
View File

@ -351,6 +351,10 @@ class BackupVMsWindow(ui_backupdlg.Ui_Backup, multiselectwidget.QtGui.QWizard):
self, self.tr("Backup error!"), self, self.tr("Backup error!"),
self.tr("ERROR: {}").format( self.tr("ERROR: {}").format(
self.thread.msg)) self.thread.msg))
self.button(self.CancelButton).setEnabled(False)
self.button(self.FinishButton).setEnabled(True)
self.cleanup_temporary_files()
else: else:
self.progress_bar.setValue(100) self.progress_bar.setValue(100)
self.progress_status.setText(self.tr("Backup finished.")) self.progress_status.setText(self.tr("Backup finished."))
@ -373,7 +377,8 @@ class BackupVMsWindow(ui_backupdlg.Ui_Backup, multiselectwidget.QtGui.QWizard):
os.system('systemctl poweroff') os.system('systemctl poweroff')
def reject(self): def reject(self):
if self.currentPage() is self.commit_page: if (self.currentPage() is self.commit_page) and \
self.button(self.CancelButton).isEnabled():
self.qubes_app.qubesd_call( self.qubes_app.qubesd_call(
'dom0', 'admin.backup.Cancel', 'dom0', 'admin.backup.Cancel',
backup_utils.get_profile_name(True)) backup_utils.get_profile_name(True))