#1646: default to use paramiko if installed

git-svn-id: https://xpra.org/svn/Xpra/trunk@19945 3bb7dfac-3a0b-4e04-842a-767bc560f471

debian/control

@@ -123,15 +123,17 @@ Recommends:
         ,python-pyinotify
         ,python-opencv
         ,v4l2loopback-dkms
+#for ssh transport:
+        ,python-paramiko
         ,openssh-client
         ,ssh-askpass
+#for using SSH passwords from the GUI launcher:
+        ,sshpass
 #for html5 support:
         ,websockify
         ,libjs-jquery
 # we cannot do versionned recommends but we need keyboard-configuration (>= 1.82)
         ,keyboard-configuration
-#for using SSH passwords from the GUI launcher:
-        ,sshpass
 Suggests: openssh-server
 # to make the system tray work again (sigh):
 		,gnome-shell-extension-top-icons-plus

rpmbuild/xpra.spec

@@ -189,6 +189,7 @@ Requires:			python2-numpy
 %if 0%{?run_tests}
 BuildRequires:		python2-numpy
 %endif
+Recommends:			python2-paramiko
 Recommends:			python2-lzo
 Recommends:         python2-kerberos
 Recommends:         python2-gssapi
@@ -353,6 +354,7 @@ Recommends:			python3-netifaces
 Recommends:			python3-dbus
 Recommends:			python3-avahi
 %if 0%{?fedora}
+Recommends:			python3-paramiko
 Recommends:			python3-lzo
 Recommends:         python3-kerberos
 Recommends:         python3-gssapi

src/xpra/platform/features.py

@@ -36,7 +36,8 @@
 
 DEFAULT_ENV = []
 
-DEFAULT_SSH_COMMAND = "ssh -x"
+#DEFAULT_SSH_COMMAND = "ssh -x"
+DEFAULT_SSH_COMMAND = "paramiko"
 DEFAULT_PULSEAUDIO_CONFIGURE_COMMANDS = [
                                          ["pactl", "set-default-sink", "Xpra-Speaker"],
                                          ["pactl", "set-default-source", "Xpra-Microphone.monitor"],

src/xpra/scripts/main.py

@@ -612,7 +612,15 @@ def parse_remote_display(s):
             #ssh:HOST or ssh/HOST
             host = parts[0]
         #ie: ssh=["/usr/bin/ssh", "-v"]
-        ssh = shlex.split(opts.ssh)
+        ssh = opts.ssh
+        if ssh=="auto":
+            try:
+                import paramiko
+                assert paramiko
+                ssh = "paramiko"
+            except ImportError as e:
+                ssh = "ssh -x"
+        ssh = shlex.split(ssh)
         desc["ssh"] = ssh
         full_ssh = ssh