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

[Guido Günther]

The following commit has been merged in the master branch:
commit e18d4f40946598b1bc929fbc401074183ae5b4c9
Author: Guido Günther <agx at sigxcpu.org>
Date:   Sat Jan 14 22:20:33 2012 +0100

    Improve error message if netcat can't forward Unix domain sockets
    
    Closes: #614291

diff --git a/debian/patches/0006-Improve-error-message-if-netcat-can-t-forward-Unix-d.patch b/debian/patches/0006-Improve-error-message-if-netcat-can-t-forward-Unix-d.patch
new file mode 100644
index 0000000..e704ce6
--- /dev/null
+++ b/debian/patches/0006-Improve-error-message-if-netcat-can-t-forward-Unix-d.patch
@@ -0,0 +1,45 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Sat, 14 Jan 2012 22:13:44 +0100
+Subject: Improve error message if netcat can't forward Unix domain sockets
+
+Otherwise the information:
+
+  End of file while reading data: nc: invalid option -- 'U'
+  nc -h for help: Input/output error
+
+is hidden in the error detail. See Debian bug:
+
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=614291
+---
+ src/virtManager/manager.py |    6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/src/virtManager/manager.py b/src/virtManager/manager.py
+index bdbd0af..0560892 100644
+--- a/src/virtManager/manager.py
++++ b/src/virtManager/manager.py
+@@ -18,6 +18,7 @@
+ # MA 02110-1301 USA.
+ #
+ 
++import re
+ import gtk
+ 
+ import virtManager.uihelpers as uihelpers
+@@ -653,12 +654,15 @@ class vmmManager(vmmGObjectUI):
+               details=details,
+               title=_("Virtual Machine Manager Connection Failure"))
+         else:
++            hint = ''
++            if re.search(r"nc: .* -- 'U'", details):
++                hint = _("\n - The remote netcat understands the '-U' option")
+             self.err.show_err(
+             _("Unable to open a connection to the libvirt "
+               "management daemon.\n\n" +
+               "Libvirt URI is: %s\n\n" % conn.get_uri() +
+               "Verify that:\n" +
+-              " - The 'libvirtd' daemon has been started\n"),
++              " - The 'libvirtd' daemon has been started") + hint,
+               details=details,
+               title=_("Virtual Machine Manager Connection Failure"))
+ 

-- 
VirtManager Debian packaging