Merge remote-tracking branch 'upstream/master'

qubesmanager/settings.py

@@ -855,7 +855,7 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog):
     def update_virt_mode_list(self):
         choices = ['HVM', 'PV']
 
-        if hasattr(self, 'dev_list'):
+        if hasattr(self, "dev_list"):
             devs_attached = self.dev_list.selected_list.count() != 0
         else:
             devs_attached = bool(list(self.vm.devices['pci'].persistent()))
@@ -866,7 +866,7 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog):
             choices.insert(0, 'PVH')
             self.pvh_mode_hidden.hide()
 
-        if hasattr(self, 'virt_mode_list'):
+        if self.virt_mode_list:
             old_mode = self.selected_virt_mode()
             self.virt_mode.currentIndexChanged.disconnect()
         else:

qubesmanager/utils.py

@@ -167,7 +167,7 @@ def get_path_from_vm(vm, service_name):
 
     if not untrusted_path:
         return None
-    if path_re.match(untrusted_path):
+    if path_re.fullmatch(untrusted_path):
         assert '../' not in untrusted_path
         assert '\0' not in untrusted_path
         return untrusted_path.strip()

ui/restoredlg.ui

@@ -268,7 +268,7 @@ p, li { white-space: pre-wrap; }
     <item>
      <widget class="QLabel" name="dom0_restored_label">
       <property name="text">
-       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;WARNING: restored dom0 files are located in ~/backup-restore-&amp;lt;timestamp&amp;gt; directory&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;WARNING: restored dom0 files are located in ~/home-restore-&amp;lt;timestamp&amp;gt; directory&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
       </property>
      </widget>
     </item>

version

@@ -1 +1 @@
-4.0.27
+4.0.31