From b0ccb608f842dd07051fa18577f5ee2d96e9a98f Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Fri, 15 May 2015 19:10:01 +0000 Subject: [PATCH] One more upstream bug fix. 4b5c836a-read-start-mode-from-inactive-conf-XML.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=233 --- ...ad-start-mode-from-inactive-conf-XML.patch | 22 +++++++++++++++++++ virt-manager.changes | 3 ++- virt-manager.spec | 5 +++-- 3 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 4b5c836a-read-start-mode-from-inactive-conf-XML.patch diff --git a/4b5c836a-read-start-mode-from-inactive-conf-XML.patch b/4b5c836a-read-start-mode-from-inactive-conf-XML.patch new file mode 100644 index 00000000..cab478b0 --- /dev/null +++ b/4b5c836a-read-start-mode-from-inactive-conf-XML.patch @@ -0,0 +1,22 @@ +Subject: interface: read the start mode from the inactive conf XML +From: Giuseppe Scrivano gscrivan@redhat.com Thu May 14 16:27:55 2015 +0200 +Date: Fri May 15 09:14:09 2015 +0200: +Git: 4b5c836a16da18e58e013a0fa6c3ca4caba00b94 + +Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1154480 + +Signed-off-by: Giuseppe Scrivano + +diff --git a/virtManager/interface.py b/virtManager/interface.py +index bd1e2ba..dc6f4da 100644 +--- a/virtManager/interface.py ++++ b/virtManager/interface.py +@@ -101,7 +101,7 @@ class vmmInterface(vmmLibvirtObject): + return "Interface" + + def get_startmode(self): +- return self.get_xmlobj().start_mode or "none" ++ return self.get_xmlobj(inactive=True).start_mode or "none" + + def set_startmode(self, newmode): + xmlobj = self._make_xmlobj_to_define() diff --git a/virt-manager.changes b/virt-manager.changes index 7578059f..25c0c2cf 100644 --- a/virt-manager.changes +++ b/virt-manager.changes @@ -1,9 +1,10 @@ ------------------------------------------------------------------- -Mon May 11 14:37:27 MDT 2015 - carnold@suse.com +Fri May 15 13:10:49 MDT 2015 - carnold@suse.com - Upstream bug fixes fbdf574c-fix-shortcut-key-for-USB-redir-dev-type.patch 2c1e482b-fix--show-host-summary-error-windows-flooding.patch + 4b5c836a-read-start-mode-from-inactive-conf-XML.patch ------------------------------------------------------------------- Fri May 8 11:08:49 MDT 2015 - carnold@suse.com diff --git a/virt-manager.spec b/virt-manager.spec index 81cbca78..b81102d9 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -1,7 +1,7 @@ # # spec file for package virt-manager # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - %define with_guestfs 0 %define askpass_package "openssh-askpass" %define qemu_user "qemu" @@ -44,6 +43,7 @@ Patch4: ac2be796-do-not-throw-exception-if-volume-or-pool-dont-exist.pat Patch5: 88e18c86-fix-sending-net-removed-signal.patch Patch6: fbdf574c-fix-shortcut-key-for-USB-redir-dev-type.patch Patch7: 2c1e482b-fix--show-host-summary-error-windows-flooding.patch +Patch8: 4b5c836a-read-start-mode-from-inactive-conf-XML.patch # SUSE Only Patch70: virtman-desktop.patch Patch71: virtman-kvm.patch @@ -169,6 +169,7 @@ machine). %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 # SUSE Only %patch70 -p1 %patch71 -p1