- Fix patch using util.is_error_nosupport (0.10.1) when it should

be using support.is_error_nosupport (0.10.0)
  added Base-mem-statistics-on-virDomainMemoryStats-if-avail.patch
- Add Requires on virt-manager for virt-install

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=140
This commit is contained in:
Charles Arnold 2014-02-03 20:40:38 +00:00 committed by Git OBS Bridge
parent d09bef1a0b
commit 2aaede282e
3 changed files with 17 additions and 10 deletions

View File

@ -44,7 +44,7 @@ Index: virt-manager-0.10.0/virtManager/domain.py
+ curmem = stats['rss'] + curmem = stats['rss']
+ totalmem = stats['actual'] + totalmem = stats['actual']
+ except libvirt.libvirtError, err: + except libvirt.libvirtError, err:
+ if util.is_error_nosupport(err): + if support.is_error_nosupport(err):
+ logging.debug("Mem stats not supported: %s", err) + logging.debug("Mem stats not supported: %s", err)
+ self._mem_stats_supported = False + self._mem_stats_supported = False
+ else: + else:

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Feb 3 13:36:52 MST 2014 - carnold@suse.com
- Fix patch using util.is_error_nosupport (0.10.1) when it should
be using support.is_error_nosupport (0.10.0)
added Base-mem-statistics-on-virDomainMemoryStats-if-avail.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jan 23 18:00:00 CET 2014 - tbehrens@suse.com Wed Jan 23 18:00:00 CET 2014 - tbehrens@suse.com

View File

@ -71,9 +71,9 @@ BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define verrel %{version}-%{release} %define verrel %{version}-%{release}
Requires: virt-manager-common = %{verrel}
Requires: gtk3 Requires: gtk3
Requires: python-gconf Requires: python-gconf
Requires: virt-manager-common = %{verrel}
Requires: vm-install >= 0.5.6 Requires: vm-install >= 0.5.6
# Libvirt-glib # Libvirt-glib
@ -88,11 +88,11 @@ Requires: typelib-1_0-Vte-2_90
Requires: gtk-vnc2 Requires: gtk-vnc2
Requires: libspice-client-glib-2_0-8 Requires: libspice-client-glib-2_0-8
Requires: libspice-client-gtk-3_0-4 Requires: libspice-client-gtk-3_0-4
Requires: typelib-1_0-GVnc-1_0
Requires: typelib-1_0-Gtk-3_0
Requires: typelib-1_0-GtkVnc-2_0
Requires: typelib-1_0-SpiceClientGlib-2_0 Requires: typelib-1_0-SpiceClientGlib-2_0
Requires: typelib-1_0-SpiceClientGtk-3_0 Requires: typelib-1_0-SpiceClientGtk-3_0
Requires: typelib-1_0-Gtk-3_0
Requires: typelib-1_0-GVnc-1_0
Requires: typelib-1_0-GtkVnc-2_0
Recommends: python-SpiceClientGtk Recommends: python-SpiceClientGtk
Requires: virt-install Requires: virt-install
@ -121,8 +121,8 @@ Group: System/Monitoring
# This version not strictly required: virt-manager should work with older, # This version not strictly required: virt-manager should work with older,
# however varying amounts of functionality will not be enabled. # however varying amounts of functionality will not be enabled.
Requires: libvirt-python >= 0.7.0 Requires: libvirt-python >= 0.7.0
Requires: python-urlgrabber
Requires: python-ipaddr Requires: python-ipaddr
Requires: python-urlgrabber
%description common %description common
Common files used by the different virt-manager interfaces, as well as Common files used by the different virt-manager interfaces, as well as
@ -135,10 +135,10 @@ Group: System/Monitoring
Requires: virt-manager-common = %{verrel} Requires: virt-manager-common = %{verrel}
Provides: virt-clone
Provides: virt-image
Provides: virt-convert
Provides: python-virtinst Provides: python-virtinst
Provides: virt-clone
Provides: virt-convert
Provides: virt-image
Obsoletes: python-virtinst <= 0.600.4 Obsoletes: python-virtinst <= 0.600.4
%description -n virt-install %description -n virt-install