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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
donoban 2019-03-17 17:09:13 +01:00
commit 8816a764ee
No known key found for this signature in database
GPG Key ID: 141310D8E3ED08A5
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qubesmanager/settings.py
View File

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

2
qubesmanager/utils.py
View File

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

2
ui/restoredlg.ui
View File

@ -268,7 +268,7 @@ p, li { white-space: pre-wrap; }
<item> <item>
<widget class="QLabel" name="dom0_restored_label"> <widget class="QLabel" name="dom0_restored_label">
<property name="text"> <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> </property>
</widget> </widget>
</item> </item>

2
version
View File

@ -1 +1 @@
4.0.27 4.0.31