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

Fixed minor errors found when debugging feature settings

Browse Source 
the check-updates default was being incorrectly set
This commit is contained in:
Marta Marczykowska-Górecka 2019-03-18 19:02:47 +01:00
parent 9d4eed63b5
commit 00ccce4816
No known key found for this signature in database
GPG Key ID: 9A752C30B26FD04B
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/global_settings.py
View File

@ -239,8 +239,9 @@ class GlobalSettingsWindow(ui_globalsettingsdlg.Ui_GlobalSettings,
self.dom0_updates_file_path = '/var/lib/qubes/updates/disable-updates' self.dom0_updates_file_path = '/var/lib/qubes/updates/disable-updates'
try: try:
self.updates_dom0_val = self.qvm_collection.check_updates_dom0 self.updates_dom0_val = self.qvm_collection.domains[
except AttributeError: 'dom0'].features['service.qubes-update-check']
except KeyError:
self.updates_dom0_val =\ self.updates_dom0_val =\
not os.path.isfile(self.dom0_updates_file_path) not os.path.isfile(self.dom0_updates_file_path)
@ -274,19 +275,14 @@ class GlobalSettingsWindow(ui_globalsettingsdlg.Ui_GlobalSettings,
def __set_updates_all(self, state): def __set_updates_all(self, state):
for vm in self.qvm_collection.domains: for vm in self.qvm_collection.domains:
vm.features['check-updates'] = state if vm.klass != "AdminVM":
vm.features['service.qubes-update-check'] = state
def __apply_updates__(self): def __apply_updates__(self):
if self.updates_dom0.isChecked() != self.updates_dom0_val: if self.updates_dom0.isChecked() != self.updates_dom0_val:
# TODO: remove workaround when it is no longer needed self.qvm_collection.domains['dom0'].features[
try: 'service.qubes-update-check'] = \
self.qvm_collection.check_updates_dom0 = \ self.updates_dom0.isChecked()
self.updates_dom0.isChecked()
except AttributeError:
if self.updates_dom0.isChecked():
os.remove(self.dom0_updates_file_path)
else:
open(self.dom0_updates_file_path, 'a').close()
self.qvm_collection.check_updates_vm = self.updates_vm.isChecked() self.qvm_collection.check_updates_vm = self.updates_vm.isChecked()