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

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

Browse Source 
* origin/pr/158:
  Fixed error in displaying error on VM Rename
This commit is contained in:
Marek Marczykowski-Górecki 2019-02-26 23:12:35 +01:00
commit 7874aa73fe
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
qubesmanager/settings.py
View File

@ -68,22 +68,18 @@ class RenameVMThread(QtCore.QThread):
setattr(holder, prop, new_vm) setattr(holder, prop, new_vm)
except qubesadmin.exc.QubesException: except qubesadmin.exc.QubesException:
failed_props += [(holder, prop)] failed_props += [(holder, prop)]
if not failed_props: if not failed_props:
del self.vm.app.domains[self.vm.name] del self.vm.app.domains[self.vm.name]
else: else:
list_text = utils.format_dependencies_list(failed_props) list_text = utils.format_dependencies_list(failed_props)
self.msg = (self.tr("Warning: rename partially unsuccessful!"),
QtGui.QMessageBox.warning( self.tr("Some properties could not be changed to "
None, "the new name. The system has now both {} "
self.tr("Warning: rename partially unsuccessful"), "and {} qubes. To resolve this, please "
self.tr("Some properties could not be changed to the new " "check and change the following properties "
"name. The system has now both {} and {} qubes. " "and remove the qube {} manually.<br>"
"To resolve this, please check and change the " ).format(self.vm.name, self.vm.name,
"following properties and remove the qube {} " self.vm.name) + list_text)
"manually.<br> ").format(
self.vm.name, self.vm.name, self.vm.name)\
+ list_text)
except qubesadmin.exc.QubesException as ex: except qubesadmin.exc.QubesException as ex:
self.msg = ("Rename error!", str(ex)) self.msg = ("Rename error!", str(ex))