virt-manager/f81358b0-dont-display-error-if-machine-is-missing-in-XML.patch
Charles Arnold d3a9e22f63 - Drop the following patches for bsc#938942 as they are not needed.
virtman-reset-image-filename-based-on-format.patch
  virtman-allow-other-disk-formats.patch
- Upstream bug fixes
  a9b303fb-fix-copy-host-cpu-definition.patch
  f81358b0-dont-display-error-if-machine-is-missing-in-XML.patch
  aebebbf8-report-an-error-for-pxe-install-without-network.patch
  4970615f-fix-qemu-vs-lxc-detection.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=246
2015-08-10 21:46:52 +00:00

30 lines
1.2 KiB
Diff

Subject: details: don't display error if machine is missing in XML
From: Pavel Hrdina phrdina@redhat.com Fri Jul 31 14:28:00 2015 +0200
Date: Wed Aug 5 13:32:04 2015 +0200:
Git: f81358b02d58b709529a35268cbaf8ce098d803a
Commint 0ddec919 updated the details page. Now the detail page of
existing domain cannot update the 'machine' value, only prints that
value. If we cannot get the machine from domain XML, don't pass a None,
but "Unknown" instead. This can happen if you are connecting with
virt-manager to really old libvirt, the machine value is present in
domain XML since libvirt v0.9.5.
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1238981
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
diff --git a/virtManager/details.py b/virtManager/details.py
index 718f50a..8507bd0 100644
--- a/virtManager/details.py
+++ b/virtManager/details.py
@@ -2457,7 +2457,7 @@ class vmmDetails(vmmGObjectUI):
self.widget("overview-firmware-label").set_text(firmware)
# Machine settings
- machtype = self.vm.get_machtype()
+ machtype = self.vm.get_machtype() or _("Unknown")
if self.widget("machine-type").is_visible():
uiutil.set_list_selection(
self.widget("machine-type"), machtype)