[Pkg-libvirt-commits] [SCM] Virt Manager packaging branch, master, updated. debian/0.6.1-1-3-g71b2fd6

Guido Günther agx at sigxcpu.org
Fri Feb 13 14:23:27 UTC 2009


The following commit has been merged in the master branch:
commit de2dae722a4b11f0c02992a6eaae5a7116784cee
Author: Guido Günther <agx at sigxcpu.org>
Date:   Fri Feb 13 14:57:20 2009 +0100

    hint to ssh-askpass
    
    if ssh authentication fails
    Closes: #513599
    Thanks: Sebastian Andrzej Siewior for the patch

diff --git a/debian/patches/0003-hint-to-ssh-askpass.patch b/debian/patches/0003-hint-to-ssh-askpass.patch
new file mode 100644
index 0000000..83722dc
--- /dev/null
+++ b/debian/patches/0003-hint-to-ssh-askpass.patch
@@ -0,0 +1,37 @@
+From: Sebastian Andrzej Siewior <sebastian at breakpoint.cc>
+Date: Fri, 13 Feb 2009 14:56:01 +0100
+Subject: [PATCH] hint to ssh-askpass
+
+if ssh authentication fails
+
+Closes: #513599
+---
+ src/virtManager/connection.py |    8 +++++++-
+ 1 files changed, 7 insertions(+), 1 deletions(-)
+
+diff --git a/src/virtManager/connection.py b/src/virtManager/connection.py
+index 011dd4c..1440f08 100644
+--- a/src/virtManager/connection.py
++++ b/src/virtManager/connection.py
+@@ -431,13 +431,19 @@ class vmmConnection(gobject.GObject):
+         else:
+             self.state = self.STATE_DISCONNECTED
+ 
++            if self.uri.find("+ssh://") > 0:
++                  hint = "\nMaybe you need to install ssh-askpass " + \
++                         "in order to authenticate."
++            else:
++                  hint = ""
++
+             (_type, value, stacktrace) = open_error
+             # Detailed error message, in English so it can be Googled.
+             self.connectError = \
+                     ("Unable to open connection to hypervisor URI '%s':\n" %
+                      str(self.uri)) + \
+                     str(_type) + " " + str(value) + "\n" + \
+-                    traceback.format_exc (stacktrace)
++                    traceback.format_exc (stacktrace) + hint
+             logging.error(self.connectError)
+ 
+         # We want to kill off this thread asap, so schedule a gobject
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index bccbc8b..c72eb6d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-use-usr-share-gconf-for-schema-data.patch
 0002-remove-disambiguity-in-storage-dialog.patch
+0003-hint-to-ssh-askpass.patch

-- 
Virt Manager packaging



More information about the Pkg-libvirt-commits mailing list