Added additional upstream patches
1243-syntax-typo.patch 1248-libvirt-connection.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=8
This commit is contained in:
Charles Arnold
Git OBS Bridge
parent
d63d020de9
commit
06631f307f
47
1243-syntax-typo.patch
Normal file
47
1243-syntax-typo.patch
Normal file
@ -0,0 +1,47 @@
|
||||
# HG changeset patch
|
||||
# User Paul W. Frields <stickster@gmail.com>
|
||||
# Date 1251729959 14400
|
||||
# Node ID d34def55dbd78e2ad5f099d6a38c1f358c798555
|
||||
# Parent b70858b9f8c6f9fea21f6e66a10e7b9498f11e5e
|
||||
addhardware: Fix error message syntax typo
|
||||
|
||||
Index: virt-manager-0.8.0/AUTHORS
|
||||
===================================================================
|
||||
--- virt-manager-0.8.0.orig/AUTHORS
|
||||
+++ virt-manager-0.8.0/AUTHORS
|
||||
@@ -59,6 +59,7 @@ Further patches have been submitted by:
|
||||
Emmanuel Lacour <elacour-at-home-dn-dot-net>
|
||||
Laurent Léonard <laurent-at-open-minds-dot-org>
|
||||
Michal Novotny <minovotn-at-redhat-dot-com>
|
||||
+ Paul W. Frields <stickster-at-gmail-dot-com>
|
||||
|
||||
<...send a patch & get your name here...>
|
||||
|
||||
Index: virt-manager-0.8.0/src/virtManager/addhardware.py
|
||||
===================================================================
|
||||
--- virt-manager-0.8.0.orig/src/virtManager/addhardware.py
|
||||
+++ virt-manager-0.8.0/src/virtManager/addhardware.py
|
||||
@@ -1186,8 +1186,8 @@ class vmmAddHardware(gobject.GObject):
|
||||
conn = self.vm.get_connection().vmm,
|
||||
name = nodedev_name)
|
||||
except Exception, e:
|
||||
- return self.err.val_err(_("Host device parameter error",
|
||||
- str(e)))
|
||||
+ return self.err.val_err(_("Host device parameter error"),
|
||||
+ str(e))
|
||||
|
||||
elif page_num == PAGE_CHAR:
|
||||
chartype = self.get_char_type()
|
||||
Index: virt-manager-0.8.0/src/vmm-manager.glade
|
||||
===================================================================
|
||||
--- virt-manager-0.8.0.orig/src/vmm-manager.glade
|
||||
+++ virt-manager-0.8.0/src/vmm-manager.glade
|
||||
@@ -118,7 +118,7 @@
|
||||
<child>
|
||||
<widget class="GtkImageMenuItem" id="menu_edit_delete">
|
||||
<property name="visible">True</property>
|
||||
- <property name="label" translatable="yes">Delete Virtual Machine</property>
|
||||
+ <property name="label" translatable="yes">Delete</property>
|
||||
<property name="use_underline">True</property>
|
||||
<signal name="activate" handler="on_menu_edit_delete_activate"/>
|
||||
<child internal-child="image">
|
||||
51
1248-libvirt-connection.patch
Normal file
51
1248-libvirt-connection.patch
Normal file
@ -0,0 +1,51 @@
|
||||
# HG changeset patch
|
||||
# User Cole Robinson <crobinso@redhat.com>
|
||||
# Date 1253131339 14400
|
||||
# Node ID 1c886d1863f72e7ddd5fb99050362296be6a9deb
|
||||
# Parent 9242a7fe76b16c6505bdd3d3d328ae8f0c56da10
|
||||
Don't close connection on all libvirt errors: only if libvirtd goes away.
|
||||
|
||||
Index: virt-manager-0.8.0/src/virtManager/connection.py
|
||||
===================================================================
|
||||
--- virt-manager-0.8.0.orig/src/virtManager/connection.py
|
||||
+++ virt-manager-0.8.0/src/virtManager/connection.py
|
||||
@@ -941,7 +941,15 @@ class vmmConnection(gobject.GObject):
|
||||
updateVMs = newVMs
|
||||
|
||||
for uuid in updateVMs:
|
||||
- self.vms[uuid].tick(now)
|
||||
+ vm = self.vms[uuid]
|
||||
+ try:
|
||||
+ vm.tick(now)
|
||||
+ except libvirt.libvirtError, e:
|
||||
+ if e.get_error_code() == libvirt.VIR_ERR_SYSTEM_ERROR:
|
||||
+ raise
|
||||
+ logging.exception("Tick for VM '%s' failed" % vm.get_name())
|
||||
+ except Exception, e:
|
||||
+ logging.exception("Tick for VM '%s' failed" % vm.get_name())
|
||||
|
||||
if not noStatsUpdate:
|
||||
self._recalculate_stats(now)
|
||||
Index: virt-manager-0.8.0/src/virtManager/engine.py
|
||||
===================================================================
|
||||
--- virt-manager-0.8.0.orig/src/virtManager/engine.py
|
||||
+++ virt-manager-0.8.0/src/virtManager/engine.py
|
||||
@@ -199,10 +199,14 @@ class vmmEngine(gobject.GObject):
|
||||
self.connections[uri]["connection"].tick()
|
||||
except KeyboardInterrupt:
|
||||
raise
|
||||
- except:
|
||||
- logging.exception("Could not refresh connection %s." % uri)
|
||||
- logging.debug("Closing connection since refresh failed.")
|
||||
- self.connections[uri]["connection"].close()
|
||||
+ except libvirt.libvirtError, e:
|
||||
+ if e.get_error_code() == libvirt.VIR_ERR_SYSTEM_ERROR:
|
||||
+ logging.exception("Could not refresh connection %s." % uri)
|
||||
+ logging.debug("Closing connection since libvirtd "
|
||||
+ "appears to have stopped.")
|
||||
+ self.connections[uri]["connection"].close()
|
||||
+ else:
|
||||
+ raise
|
||||
return 1
|
||||
|
||||
def change_timer_interval(self,ignore1,ignore2,ignore3,ignore4):
|
||||
@ -4,7 +4,9 @@ Mon Sep 21 16:00:56 MDT 2009 - carnold@novell.com
|
||||
- Added upstream bug fixes.
|
||||
1240-cdrom-driver-name.patch
|
||||
1242-delete-active-vm.patch
|
||||
1243-syntax-typo.patch
|
||||
1245-storage-browser-selection.patch
|
||||
1248-libvirt-connection.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 28 16:44:17 MDT 2009 - carnold@novell.com
|
||||
|
||||
@ -26,7 +26,7 @@ Name: virt-manager
|
||||
%define virtinst_rel 0
|
||||
%define virtinst_name virtinst-%{virtinst_maj}.%{virtinst_min}.%{virtinst_rel}
|
||||
Version: 0.8.0
|
||||
Release: 2
|
||||
Release: 3
|
||||
Summary: Virtual Machine Manager
|
||||
Group: System/Monitoring
|
||||
License: LGPL v2.1 or later
|
||||
@ -37,7 +37,9 @@ Source0: virt-manager-%{version}.tar.bz2
|
||||
Source1: %{virtinst_name}.tar.bz2
|
||||
Patch0: 1240-cdrom-driver-name.patch
|
||||
Patch1: 1242-delete-active-vm.patch
|
||||
Patch2: 1245-storage-browser-selection.patch
|
||||
Patch2: 1243-syntax-typo.patch
|
||||
Patch3: 1245-storage-browser-selection.patch
|
||||
Patch4: 1248-libvirt-connection.patch
|
||||
Patch51: virtman-desktop.diff
|
||||
Patch52: virtman-vminstall.diff
|
||||
Patch53: virtman-netcat.diff
|
||||
@ -123,6 +125,8 @@ Authors:
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch51 -p1
|
||||
%patch52 -p1
|
||||
%patch53 -p1
|
||||
@ -186,7 +190,7 @@ sed -i -e 's/Categories=.*/Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Virtualization;
|
||||
# sed -i '\^/usr/share/gnome/help/^d' %{name}.lang
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
# rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%pre -f %{name}.schemas_pre
|
||||
|
||||
|
||||
@ -12,7 +12,7 @@ Index: virt-manager-0.8.0/src/virtManager/engine.py
|
||||
from virtManager.host import vmmHost
|
||||
from virtManager.error import vmmErrorDialog
|
||||
from virtManager.systray import vmmSystray
|
||||
@@ -390,13 +391,24 @@ class vmmEngine(gobject.GObject):
|
||||
@@ -394,13 +395,24 @@ class vmmEngine(gobject.GObject):
|
||||
return False
|
||||
return True
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user