[Pkg-libvirt-commits] [SCM] VirtManager Debian packaging branch, master, updated. debian/0.8.4-2-1-gbcf0e99

[Guido Günther]

The following commit has been merged in the master branch:
commit bcf0e99cc171b7fbd22098721066f75f248383b5
Author: Guido Günther <agx at sigxcpu.org>
Date:   Wed Apr 28 20:08:28 2010 +0200

    New patch 0002-console-Don-t-throw-traceback-if-we-can-t-read-error.patch
    
    console: Don't throw traceback if we can't read error fd.
    Thanks: Cole Robinson

diff --git a/debian/patches/0002-console-Don-t-throw-traceback-if-we-can-t-read-error.patch b/debian/patches/0002-console-Don-t-throw-traceback-if-we-can-t-read-error.patch
new file mode 100644
index 0000000..8f6ca23
--- /dev/null
+++ b/debian/patches/0002-console-Don-t-throw-traceback-if-we-can-t-read-error.patch
@@ -0,0 +1,29 @@
+From: Cole Robinson <crobinso at redhat.com>
+Date: Wed, 28 Apr 2010 20:07:09 +0200
+Subject: [PATCH] console: Don't throw traceback if we can't read error fd.
+
+This is racy and best effort, so don't log errors if we fail.
+
+Origin: Upstream, http://hg.fedorahosted.org/hg/virt-manager/rev/c206b12a8c7a
+---
+ src/virtManager/console.py |    6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/src/virtManager/console.py b/src/virtManager/console.py
+index cbefcb3..2333bc4 100644
+--- a/src/virtManager/console.py
++++ b/src/virtManager/console.py
+@@ -573,7 +573,11 @@ class vmmConsolePages(gobject.GObject):
+         errfd = self.vncTunnel[1]
+         errout = ""
+         while True:
+-            new = errfd.recv(1024)
++            try:
++                new = errfd.recv(1024)
++            except:
++                break
++
+             if not new:
+                 break
+ 
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index dacd57a..b59882c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-use-usr-share-gconf-for-schema-data.patch
+0002-console-Don-t-throw-traceback-if-we-can-t-read-error.patch

-- 
VirtManager Debian packaging