Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
8816a764ee
@ -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:
|
||||
|
@ -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()
|
||||
|
@ -268,7 +268,7 @@ p, li { white-space: pre-wrap; }
|
||||
<item>
|
||||
<widget class="QLabel" name="dom0_restored_label">
|
||||
<property name="text">
|
||||
<string><html><head/><body><p><span style=" font-weight:600;">WARNING: restored dom0 files are located in ~/backup-restore-&lt;timestamp&gt; directory</span></p></body></html></string>
|
||||
<string><html><head/><body><p><span style=" font-weight:600;">WARNING: restored dom0 files are located in ~/home-restore-&lt;timestamp&gt; directory</span></p></body></html></string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
Loading…
Reference in New Issue
Block a user