[gentoo-commits] gentoo-x86 commit in app-emulation/virt-manager/files: virt-manager-0.8.2-ssh-tunnel-shutdown.patch

[Doug Goldstein (cardoe)]

cardoe      10/02/04 17:48:39

  Added:                virt-manager-0.8.2-ssh-tunnel-shutdown.patch
  Log:
  fix issue when nc doesn't handle the EOF on socket close correctly. According to upstream Debian has an issue with it but they're patching up their nc to respect EOF better. So, the only solution is to kill the ssh tunnel instead of just assuming it'll close eventually
  (Portage version: 2.1.7.17/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  app-emulation/virt-manager/files/virt-manager-0.8.2-ssh-tunnel-shutdown.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virt-manager/files/virt-manager-0.8.2-ssh-tunnel-shutdown.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virt-manager/files/virt-manager-0.8.2-ssh-tunnel-shutdown.patch?rev=1.1&content-type=text/plain

Index: virt-manager-0.8.2-ssh-tunnel-shutdown.patch
===================================================================
diff -Nur virt-manager-0.8.2/src/virtManager/console.py virt-manager-0.8.2-ssh-tunnel/src/virtManager/console.py
--- virt-manager-0.8.2/src/virtManager/console.py	2009-12-14 16:40:30.000000000 -0600
+++ virt-manager-0.8.2-ssh-tunnel/src/virtManager/console.py	2010-02-04 11:40:17.000000000 -0600
@@ -29,6 +29,7 @@
 import gtkvnc
 import os
 import socket
+import signal
 
 from virtManager.error import vmmErrorDialog
 
@@ -534,7 +535,7 @@
         logging.debug("Shutting down tunnel PID %d FD %d" %
                       (self.vncTunnel[1], self.vncTunnel[0].fileno()))
         self.vncTunnel[0].close()
-        os.waitpid(self.vncTunnel[1], 0)
+        os.kill(self.vncTunnel[1], signal.SIGTERM)
         self.vncTunnel = None
 
     def try_login(self, src=None):