[X2Go-Commits] [pyhoca-cli] 04/11: pyhoca-clI: Reserve -l as username option. Just like in OpenSSH.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository pyhoca-cli.

commit 56fc65147d191fde97a6ccb33b3a40fca3c7a9be
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Sep 18 11:32:36 2018 +0000

    pyhoca-clI: Reserve -l as username option. Just like in OpenSSH.
---
 pyhoca-cli | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyhoca-cli b/pyhoca-cli
index 7bf6138..989774b 100755
--- a/pyhoca-cli
+++ b/pyhoca-cli
@@ -136,7 +136,7 @@ action_options =   [
                    {'args':['-T','--terminate'], 'default': None, 'metavar': 'SESSION_NAME', 'help': 'terminate running X2Go session SESSION_NAME', },
                    {'args':['-L','--list-sessions'], 'default': False, 'action': 'store_true', 'help': 'list user\'s X2Go sessions on server', },
                    {'args':['--list-desktops'], 'default': False, 'action': 'store_true', 'help': 'list X2Go desktop sessions that are available for sharing', },
-                   {'args':['-l','--list-profiles'], 'default': False, 'action': 'store_true', 'help': 'list user\'s X2Go pre-configured session profiles', },
+                   {'args':['--list-profiles'], 'default': False, 'action': 'store_true', 'help': 'list user\'s X2Go pre-configured session profiles', },
                    {'args':['-P','--session-profile'], 'default': None, 'help': 'load x2goclient session profiles and use the session profile SESSION_PROFILE', },
                  ]
 if _X2GOCLIENT_OS == "Linux":
@@ -156,7 +156,7 @@ debug_options =   [
 x2go_options =    [
                     # NOT IMPLEMENTED {'args':['--config'], 'default': '~/.x2goclient/sessions', 'help': 'x2goclient config file containing x2go session settings (default: ~/.x2goclient/sessions)', },
                     {'args':['-c','--command'], 'default': 'TERMINAL', 'help': 'command to run with -R mode on server (default: xterm)', },
-                    {'args':['-u','--username'], 'default': None, 'help': 'username for the session (default: current user)', },
+                    {'args':['-l', '-u','--username'], 'default': None, 'help': 'username for the session (default: current user)', },
                     {'args':['--password'], 'default': None, 'help': 'user password for session authentication', },
                     {'args':['--force-password'], 'default': False, 'action': 'store_true', 'help': 'enforce username/password authentication', },
                     {'args':['-p','--remote-ssh-port'], 'default': '22', 'help': 'remote SSH port (default: 22)', },

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pyhoca-cli.git