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

Fixed error in setting Updatevm to None in Global Settings

Browse Source 
Replaced old, manual vm list with a nicer, less disgusting
utils.prepare_vm_choice approach.
This commit is contained in:
Marta Marczykowska-Górecka 2018-01-25 22:03:07 +01:00
parent fb4870a16b
commit c1e9074cb9
No known key found for this signature in database
GPG Key ID: 9A752C30B26FD04B
1 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
qubesmanager/global_settings.py
View File

@ -30,6 +30,7 @@ from qubesadmin import Qubes
from qubesadmin.utils import parse_size, updates_vms_status from qubesadmin.utils import parse_size, updates_vms_status
from . import ui_globalsettingsdlg # pylint: disable=no-name-in-module from . import ui_globalsettingsdlg # pylint: disable=no-name-in-module
from . import utils
from configparser import ConfigParser from configparser import ConfigParser
@ -63,19 +64,10 @@ class GlobalSettingsWindow(ui_globalsettingsdlg.Ui_GlobalSettings,
all_vms = [vm for vm in self.qvm_collection.domains all_vms = [vm for vm in self.qvm_collection.domains
if (not vm.features.get('internal', False)) and vm.qid != 0] if (not vm.features.get('internal', False)) and vm.qid != 0]
self.updatevm_idx = -1 self.update_vm_vmlist, self.update_vm_vmidx = utils.prepare_vm_choice(
self.update_vm_combo, self.qvm_collection, 'updatevm',
current_update_vm = self.qvm_collection.updatevm None, allow_none=True
for (i, vm) in enumerate(all_vms): )
text = vm.name
if vm is current_update_vm:
self.updatevm_idx = i
text += self.tr(" (current)")
self.update_vm_combo.insertItem(i, text)
self.update_vm_combo.insertItem(len(all_vms), "none")
if current_update_vm is None:
self.updatevm_idx = len(all_vms)
self.update_vm_combo.setCurrentIndex(self.updatevm_idx)
# clockvm # clockvm
self.clockvm_idx = -1 self.clockvm_idx = -1
@ -123,12 +115,8 @@ class GlobalSettingsWindow(ui_globalsettingsdlg.Ui_GlobalSettings,
def __apply_system_defaults__(self): def __apply_system_defaults__(self):
#upatevm #upatevm
if self.update_vm_combo.currentIndex() != self.updatevm_idx: self.qvm_collection.updatevm = \
updatevm_name = str(self.update_vm_combo.currentText()) self.update_vm_vmlist[self.update_vm_combo.currentIndex()]
updatevm_name = updatevm_name.split(' ')[0]
updatevm = self.qvm_collection.domains[updatevm_name]
self.qvm_collection.updatevm = updatevm
#clockvm #clockvm
if self.clock_vm_combo.currentIndex() != self.clockvm_idx: if self.clock_vm_combo.currentIndex() != self.clockvm_idx: