Merge remote-tracking branch 'upstream/master'

.travis.yml

@@ -1,5 +1,5 @@
 sudo: required
-dist: trusty
+dist: xenial
 language: python
 python:
   - '3.5'
@@ -11,3 +11,9 @@ script:
  - ~/qubes-builder/scripts/travis-build
 env:
  - DIST_DOM0=fc25 USE_QUBES_REPO_VERSION=4.0 USE_QUBES_REPO_TESTING=1
+
+# don't build tags which are meant for code signing only
+branches:
+  except:
+    - /.*_.*/
+    - build

qubesmanager/backup.py

@@ -351,6 +351,10 @@ class BackupVMsWindow(ui_backupdlg.Ui_Backup, multiselectwidget.QtGui.QWizard):
                 self, self.tr("Backup error!"),
                 self.tr("ERROR: {}").format(
                     self.thread.msg))
+            self.button(self.CancelButton).setEnabled(False)
+            self.button(self.FinishButton).setEnabled(True)
+            self.cleanup_temporary_files()
+
         else:
             self.progress_bar.setValue(100)
             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')
 
     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(
                 'dom0', 'admin.backup.Cancel',
                 backup_utils.get_profile_name(True))

qubesmanager/global_settings.py

@@ -239,8 +239,9 @@ class GlobalSettingsWindow(ui_globalsettingsdlg.Ui_GlobalSettings,
         self.dom0_updates_file_path = '/var/lib/qubes/updates/disable-updates'
 
         try:
-            self.updates_dom0_val = self.qvm_collection.check_updates_dom0
-        except AttributeError:
+            self.updates_dom0_val = self.qvm_collection.domains[
+                'dom0'].features['service.qubes-update-check']
+        except KeyError:
             self.updates_dom0_val =\
                 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):
         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):
         if self.updates_dom0.isChecked() != self.updates_dom0_val:
-            # TODO: remove workaround when it is no longer needed
-            try:
-                self.qvm_collection.check_updates_dom0 = \
-                    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.domains['dom0'].features[
+                'service.qubes-update-check'] = \
+                self.updates_dom0.isChecked()
 
         self.qvm_collection.check_updates_vm = self.updates_vm.isChecked()