[Pkg-libvirt-commits] [SCM] VirtManager Debian packaging branch, master, updated. debian/0.9.0-5

[Guido Günther]

The following commit has been merged in the master branch:
commit d5baa70981ccdef53f4c1806d2d70c0f3a67c27a
Author: Guido Günther <agx at sigxcpu.org>
Date:   Sun Jan 15 13:48:34 2012 +0100

    console: Fix hang when reconnecting to remote VNC console
    
    Cherry-picked from upstream (e18d4f40946598b1bc929fbc401074183ae5b4c9)

diff --git a/debian/patches/0007-console-Fix-hang-when-reconnecting-to-remote-VNC-con.patch b/debian/patches/0007-console-Fix-hang-when-reconnecting-to-remote-VNC-con.patch
new file mode 100644
index 0000000..4c9ac4f
--- /dev/null
+++ b/debian/patches/0007-console-Fix-hang-when-reconnecting-to-remote-VNC-con.patch
@@ -0,0 +1,31 @@
+From: Cole Robinson <crobinso at redhat.com>
+Date: Thu, 22 Dec 2011 12:55:40 -0500
+Subject: console: Fix hang when reconnecting to remote VNC console
+
+VNC disconnect signals aren't being delivered, meaning we never cleanup
+up SSH tunnels for remote VNC connections. This causes a reconnect
+attempt to hang, trying to reuse the existing tunnels (which doesn't
+work).
+
+The problem is that we are cleaning up the VNC widget too early,
+unregistering callbacks before they get a chance to be invoked.
+
+Not cleaning up only causes a small memory leak for every console we
+open, so only a minor problem compared to the original issue. A more
+involved fix is required to clean up safely.
+---
+ src/virtManager/console.py |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/src/virtManager/console.py b/src/virtManager/console.py
+index bd08cc3..a90b260 100644
+--- a/src/virtManager/console.py
++++ b/src/virtManager/console.py
+@@ -844,7 +844,6 @@ class vmmConsolePages(vmmGObjectUI):
+             viewport.remove(w)
+ 
+         v.close()
+-        v.cleanup()
+         self.viewer_connected = False
+         self.leave_fullscreen()
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 49610e0..b33207a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,5 @@
 0003-virt-manager-Fix-Resize-to-VM-menu-option.patch
 0004-console-Fix-crashes-when-deleting-vm-on-F16.patch
 0005-storagebrowser-ignore-unparseable-volumes.patch
+0006-Improve-error-message-if-netcat-can-t-forward-Unix-d.patch
+0007-console-Fix-hang-when-reconnecting-to-remote-VNC-con.patch

-- 
VirtManager Debian packaging