Fix running virt-manager on rawhide (bz #1024569)
Fix vcpu vs. maxvcpu UI (bz #1016318) Fix app startup when run as root (bz #1016435) Release serial console when details window is closed (bz #1016445) Clarify snapshot VM state UI (bz #1016604) Fix adding qemu-guest-agent by default (bz #1016613) Fix first run app install (bz #1016825) Fix error reporting if initrd fetch fails (bz #1017419) Fix error reporting if app is run with no DISPLAY (bz #1021482) Fix usage of install media in /home/crobinso (bz #1025355)
This commit is contained in:
parent
c5cc51781f
commit
a31cbb693a
@ -0,0 +1,56 @@
|
||||
From d5a737e728351deeda858527999346d79abdb2f9 Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <d5a737e728351deeda858527999346d79abdb2f9.1384101775.git.crobinso@redhat.com>
|
||||
From: Giuseppe Scrivano <gscrivan@redhat.com>
|
||||
Date: Wed, 30 Oct 2013 17:00:15 +0100
|
||||
Subject: [PATCH] virtManager: do not call set_cell_data_func with an empty
|
||||
func
|
||||
|
||||
It fixes this exception:
|
||||
|
||||
Traceback (most recent call last):
|
||||
File "src/virt-manager/virtManager/engine.py", line 133, in _activate
|
||||
self.show_manager()
|
||||
File "src/virt-manager/virtManager/engine.py", line 867, in show_manager
|
||||
self._do_show_manager(None)
|
||||
File "src/virt-manager/virtManager/engine.py", line 811, in _do_show_manager
|
||||
manager = self.get_manager()
|
||||
File "src/virt-manager/virtManager/engine.py", line 772, in get_manager
|
||||
obj = vmmManager()
|
||||
File "src/virt-manager/virtManager/manager.py", line 173, in __init__
|
||||
self.init_stats()
|
||||
File "src/virt-manager/virtManager/manager.py", line 276, in init_stats
|
||||
self.toggle_host_cpu_usage_visible_widget()
|
||||
File "src/virt-manager/virtManager/manager.py", line 1026, in toggle_host_cpu_usage_visible_widget
|
||||
self.host_cpu_usage_img, "menu_view_stats_host_cpu")
|
||||
File "src/virt-manager/virtManager/manager.py", line 1003, in _toggle_graph_helper
|
||||
col.set_cell_data_func(img, datafunc, None)
|
||||
File "/usr/lib/python2.7/site-packages/gi/overrides/Gtk.py", line 1320, in set_cell_data_func
|
||||
super(TreeViewColumn, self).set_cell_data_func(cell_renderer, func, func_data)
|
||||
TypeError: When passing None for a callback userdata must also be None
|
||||
|
||||
Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1024569
|
||||
|
||||
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
|
||||
---
|
||||
virtManager/manager.py | 5 ++---
|
||||
1 file changed, 2 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/virtManager/manager.py b/virtManager/manager.py
|
||||
index 114904b..fe5be75 100644
|
||||
--- a/virtManager/manager.py
|
||||
+++ b/virtManager/manager.py
|
||||
@@ -998,9 +998,8 @@ class vmmManager(vmmGObjectUI):
|
||||
for child in col.get_cells():
|
||||
if isinstance(child, CellRendererSparkline):
|
||||
img = child
|
||||
- datafunc = do_show and datafunc or None
|
||||
-
|
||||
- col.set_cell_data_func(img, datafunc, None)
|
||||
+ if do_show:
|
||||
+ col.set_cell_data_func(img, datafunc, None)
|
||||
col.set_visible(do_show)
|
||||
self.widget(menu).set_active(do_show)
|
||||
|
||||
--
|
||||
1.8.4.2
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
80dcb1974254309e2d2506fe34c0f2a8 virt-manager-79196cdf.tar.gz
|
||||
5c82294f7647ba14746a64c947c52b9f virt-manager-1ffcc0cc.tar.gz
|
||||
|
@ -20,8 +20,8 @@
|
||||
|
||||
|
||||
%define _version 0.10.0
|
||||
%define _release 4
|
||||
%define gitcommit 79196cdf
|
||||
%define _release 5
|
||||
%define gitcommit 1ffcc0cc
|
||||
|
||||
# This macro is used for the continuous automated builds. It just
|
||||
# allows an extra fragment based on the timestamp to be appended
|
||||
@ -47,6 +47,10 @@ URL: http://virt-manager.org/
|
||||
#
|
||||
#Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz
|
||||
Source0: virt-manager-%{gitcommit}.tar.gz
|
||||
|
||||
# Fix running virt-manager on rawhide (bz #1024569)
|
||||
# Remove this when pygobject is built with the fix
|
||||
Patch0001: 0001-virtManager-do-not-call-set_cell_data_func-with-an-e.patch
|
||||
BuildArch: noarch
|
||||
|
||||
Requires: virt-manager-common = %{verrel}
|
||||
@ -110,6 +114,10 @@ machine).
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
# Fix running virt-manager on rawhide (bz #1024569)
|
||||
# Remove this when pygobject is built with the fix
|
||||
%patch0001 -p1
|
||||
|
||||
%build
|
||||
%if %{qemu_user}
|
||||
%define _qemu_user --qemu-user=%{qemu_user}
|
||||
@ -215,6 +223,18 @@ fi
|
||||
|
||||
|
||||
%changelog
|
||||
* Sun Nov 10 2013 Cole Robinson <crobinso@redhat.com> - 0.10.0-5.git1ffcc0cc
|
||||
- Fix running virt-manager on rawhide (bz #1024569)
|
||||
- Fix vcpu vs. maxvcpu UI (bz #1016318)
|
||||
- Fix app startup when run as root (bz #1016435)
|
||||
- Release serial console when details window is closed (bz #1016445)
|
||||
- Clarify snapshot VM state UI (bz #1016604)
|
||||
- Fix adding qemu-guest-agent by default (bz #1016613)
|
||||
- Fix first run app install (bz #1016825)
|
||||
- Fix error reporting if initrd fetch fails (bz #1017419)
|
||||
- Fix error reporting if app is run with no DISPLAY (bz #1021482)
|
||||
- Fix usage of install media in /home/crobinso (bz #1025355)
|
||||
|
||||
* Sun Oct 06 2013 Cole Robinson <crobinso@redhat.com> - 0.10.0-4.git79196cdf
|
||||
- Fix cdrom ordering if added via 'customize' (bz #905439)
|
||||
- Default to spice/qxl for virt-install (bz #911734)
|
||||
|
Loading…
Reference in New Issue
Block a user