x2go-commits

x2go-commits@lists.x2go.org

37909 discussions

[x2goclient] 53/94: getting rid of empty lines
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.1.4.0 in repository x2goclient. commit d4bf467131f1a1be1814f2936ab45b40c56bb33c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 17 10:07:44 2011 +0200 getting rid of empty lines --- pyhoca/cli/frontend.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index 3d28eb10..49dacf4b 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -271,8 +271,6 @@ class PyHocaCLI(x2go.X2goClient): except KeyboardInterrupt: self._runtime_error('Authentication cancelled by user by hitting Ctrl-C at password prompt.', exitcode=-200) - - except socket.error, e: self._runtime_error('a socket error occured while establishing the connection: %s' % str(e), exitcode=-245) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 49/94: fixes UTF-8 error, session profile usage + password auth now fixed
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.1.4.0 in repository x2goclient. commit d471d3d9c2152fa83328b3ea751b512889f07963 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 17 09:43:08 2011 +0200 fixes UTF-8 error, session profile usage + password auth now fixed --- pyhoca/cli/frontend.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index 634d48ba..111874cd 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -216,7 +216,7 @@ class PyHocaCLI(x2go.X2goClient): # setup up the manually configured X2go session self.x2go_session_hash = self._X2goClient__register_session(args.server, port=int(self.args.remote_ssh_port), known_hosts=ssh_known_hosts_filename, - username=self.args.username, + username=self.args.username, password=self.args.password, key_filename=self.args.ssh_privkey, add_to_known_hosts=self.args.add_to_known_hosts, @@ -247,14 +247,14 @@ class PyHocaCLI(x2go.X2goClient): while not connected: try: - self._X2goClient__connect_session(self.x2go_session_hash, force_password_auth=force_password_auth) + self._X2goClient__connect_session(self.x2go_session_hash, username=_username, password=self.args.password, force_password_auth=force_password_auth) connected = True except x2go.AuthenticationException, e: force_password_auth = True - self._pyhoca_logger('interactive login for user »%s«' % _username, loglevel=x2go.loglevel_NOTICE, ) + self._pyhoca_logger('interactive login for user ,,%s\'\'' % _username, loglevel=x2go.loglevel_NOTICE, ) self.args.password = getpass.getpass() except x2go.PasswordRequiredException, e: - self._pyhoca_logger('interactive login for user »%s«' % _username, loglevel=x2go.loglevel_NOTICE, ) + self._pyhoca_logger('interactive login for user ,,%s\'\'' % _username, loglevel=x2go.loglevel_NOTICE, ) self.args.password = getpass.getpass() except x2go.BadHostKeyException: self._runtime_error('SSH host key verification for remote host [%s]:%s failed' % (self.args.server, self.args.remote_ssh_port), exitcode=-254) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 50/94: raising a runtime error, if session profile name does not exist
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.1.4.0 in repository x2goclient. commit 9914dc4fd27805cae63ea1d6ccaf64ece46cb69b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 17 09:47:51 2011 +0200 raising a runtime error, if session profile name does not exist --- pyhoca/cli/frontend.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index 111874cd..0346cf8b 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -196,7 +196,10 @@ class PyHocaCLI(x2go.X2goClient): x2go.X2goClient.__init__(self, logger=liblogger) _profiles = self._X2goClient__get_profiles() - if self.args.session_profile and _profiles.has_profile(self.args.session_profile): + if not _profiles.has_profile(self.args.session_profile): + self._runtime_error('no such session profile of name: %s.' % (self.args.session_profile), exitcode=31) + + if self.args.session_profile: # override session profile options by option values from the arg parser kwargs={} -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 51/94: only raising error if session_profile arg was specified
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.1.4.0 in repository x2goclient. commit 0b96e036d66981b508e49c9a1750bf4c7b1504fb Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 17 09:48:36 2011 +0200 only raising error if session_profile arg was specified --- pyhoca/cli/frontend.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index 0346cf8b..3b1a964f 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -196,7 +196,7 @@ class PyHocaCLI(x2go.X2goClient): x2go.X2goClient.__init__(self, logger=liblogger) _profiles = self._X2goClient__get_profiles() - if not _profiles.has_profile(self.args.session_profile): + if self.args.session_profile and not _profiles.has_profile(self.args.session_profile): self._runtime_error('no such session profile of name: %s.' % (self.args.session_profile), exitcode=31) if self.args.session_profile: -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 45/94: change loglevel option from arg to kwarg parameter
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.1.4.0 in repository x2goclient. commit 344e4b54924ee801e4a9da9be95ec906cd79ea48 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 17 09:16:24 2011 +0200 change loglevel option from arg to kwarg parameter --- pyhoca/cli/frontend.py | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index 45e5cfed..36bc76d1 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -123,7 +123,7 @@ class PyHocaCLI(x2go.X2goClient): else: _server = self.args.server # clean all sessions from X2go server - self.logger('cleaning up all running sessions from X2go server: %s' % _server, x2go.loglevel_NOTICE, ) + self.logger('cleaning up all running sessions from X2go server: %s' % _server, loglevel=x2go.loglevel_NOTICE, ) self._X2goClient__clean_sessions(s_hash) @@ -132,7 +132,7 @@ class PyHocaCLI(x2go.X2goClient): STILL UNDOCUMENTED """ # start a new session and run a command - self.logger('starting a new X2go session', x2go.loglevel_INFO, ) + self.logger('starting a new X2go session', loglevel=x2go.loglevel_INFO, ) if self.args.session_profile is None: self.logger('command for new session is: %s' % self.args.command, loglevel=x2go.loglevel_DEBUG, ) else: @@ -145,7 +145,7 @@ class PyHocaCLI(x2go.X2goClient): STILL UNDOCUMENTED """ # resume a running session - self.logger('resuming X2go session: %s' % self.args.resume, x2go.loglevel_INFO, ) + self.logger('resuming X2go session: %s' % self.args.resume, loglevel=x2go.loglevel_INFO, ) available_sessions = self._X2goClient__list_sessions(s_hash) if self.args.resume in available_sessions.keys(): self._X2goClient__resume_session(s_hash, self.args.resume) @@ -158,7 +158,7 @@ class PyHocaCLI(x2go.X2goClient): STILL UNDOCUMENTED """ # send a suspend request to a session - self.logger('requesting X2go session suspend of session: %s' % self.args.suspend, x2go.loglevel_INFO, ) + self.logger('requesting X2go session suspend of session: %s' % self.args.suspend, loglevel=x2go.loglevel_INFO, ) available_sessions = self._X2goClient__list_sessions(s_hash) if self.args.suspend in available_sessions.keys(): self._X2goClient__suspend_session(s_hash, self.args.suspend) @@ -171,7 +171,7 @@ class PyHocaCLI(x2go.X2goClient): STILL UNDOCUMENTED """ # send a terminate request to a session - self.logger('requesting X2go session terminate of session: %s' % self.args.terminate, x2go.loglevel_INFO, ) + self.logger('requesting X2go session terminate of session: %s' % self.args.terminate, loglevel=x2go.loglevel_INFO, ) available_sessions = self._X2goClient__list_sessions(s_hash) if self.args.terminate in available_sessions.keys(): self._X2goClient__terminate_session(s_hash, self.args.terminate) @@ -191,7 +191,7 @@ class PyHocaCLI(x2go.X2goClient): self._pyhoca_logger.tag = 'PyHocaCLI' # initialize the X2goClient context and start the connection to the X2go server - self._pyhoca_logger('preparing requested X2go session', x2go.loglevel_NOTICE, ) + self._pyhoca_logger('preparing requested X2go session', loglevel=x2go.loglevel_NOTICE, ) x2go.X2goClient.__init__(self, logger=liblogger) @@ -248,10 +248,12 @@ class PyHocaCLI(x2go.X2goClient): try: self._X2goClient__connect_session(self.x2go_session_hash, force_password_auth=force_password_auth) connected = True - except x2go.AuthenticationException: + except x2go.AuthenticationException, e: force_password_auth = True + self._pyhoca_logger('interactive login for user %s' % self.args.username, loglevel=x2go.loglevel_NOTICE, ) self.args.password = getpass.getpass() - except x2go.PasswordRequiredException: + except x2go.PasswordRequiredException, e: + self._pyhoca_logger('interactive login for user %s' % self.args.username, loglevel=2go.loglevel_NOTICE, ) self.args.password = getpass.getpass() except x2go.BadHostKeyException: self._runtime_error('SSH host key verification for remote host [%s]:%s failed' % (self.args.server, self.args.remote_ssh_port), exitcode=-254) @@ -302,7 +304,7 @@ class PyHocaCLI(x2go.X2goClient): # give the session some time to come up... # no CTRL-C is allowed during this phase... i=0 - self._pyhoca_logger("give the X2go session some time to come up...", x2go.loglevel_NOTICE, ) + self._pyhoca_logger("give the X2go session some time to come up...", loglevel=x2go.loglevel_NOTICE, ) while i < self.args.time_to_wait: time.sleep(1) i+=1 @@ -311,9 +313,9 @@ class PyHocaCLI(x2go.X2goClient): profile_name = self._X2goClient__get_session_profile_name(self.x2go_session_hash) session_name = self._X2goClient__get_session_name(self.x2go_session_hash) - self._pyhoca_logger("X2go session is now running, the X2go client's profile name is: %s" % profile_name, x2go.loglevel_INFO, ) - self._pyhoca_logger("X2go session name is: %s" % session_name, x2go.loglevel_INFO, ) - self._pyhoca_logger("Press CTRL+C to suspend the running session...", x2go.loglevel_NOTICE, ) + self._pyhoca_logger("X2go session is now running, the X2go client's profile name is: %s" % profile_name, loglevel=x2go.loglevel_INFO, ) + self._pyhoca_logger("X2go session name is: %s" % session_name, loglevel=x2go.loglevel_INFO, ) + self._pyhoca_logger("Press CTRL+C to suspend the running session...", loglevel=x2go.loglevel_NOTICE, ) try: session_duration = 0 @@ -327,18 +329,18 @@ class PyHocaCLI(x2go.X2goClient): time.sleep(2) if self._X2goClient__has_session_terminated(self.x2go_session_hash): - self._pyhoca_logger("X2go session %s has terminated" % session_name, x2go.loglevel_NOTICE, ) + self._pyhoca_logger("X2go session %s has terminated" % session_name, loglevel=x2go.loglevel_NOTICE, ) elif self._X2goClient__is_session_suspended(self.x2go_session_hash): - self._pyhoca_logger("X2go session %s has been suspended" % session_name, x2go.loglevel_NOTICE, ) + self._pyhoca_logger("X2go session %s has been suspended" % session_name, loglevel=x2go.loglevel_NOTICE, ) elif self._X2goClient__is_session_running(self.x2go_session_hash): - self._pyhoca_logger("X2go session %s has been moved to a different screen" % session_name, x2go.loglevel_NOTICE, ) + self._pyhoca_logger("X2go session %s has been moved to a different screen" % session_name, loglevel=x2go.loglevel_NOTICE, ) except KeyboardInterrupt: - self._pyhoca_logger("Suspending X2go session %s" % session_name, x2go.loglevel_INFO, ) + self._pyhoca_logger("Suspending X2go session %s" % session_name, loglevel=x2go.loglevel_INFO, ) self._X2goClient__suspend_session(self.x2go_session_hash) # giving nxproxy's SSH tunnel some time to settle time.sleep(2) - self._pyhoca_logger("X2go session %s has been suspended" % session_name, x2go.loglevel_NOTICE, ) + self._pyhoca_logger("X2go session %s has been suspended" % session_name, loglevel=x2go.loglevel_NOTICE, ) except x2go.X2goSessionException, e: self._pyhoca_logger("X2goSessionException occured:", loglevel=x2go.loglevel_ERROR) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 47/94: take user name from session profile if --session-profile is used
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.1.4.0 in repository x2goclient. commit a777014192b21d25b5f119a0647a5c370f574491 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 17 09:24:08 2011 +0200 take user name from session profile if --session-profile is used --- pyhoca-cli | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pyhoca-cli b/pyhoca-cli index 4b74424f..c26198de 100755 --- a/pyhoca-cli +++ b/pyhoca-cli @@ -184,7 +184,7 @@ Possible values for the --pack NX option are: version() # if no username is given we use the uid under which this programme is run - if a.username is None: + if a.username is None and not a.session_profile: a.username = current_user # statically no password from the command line @@ -272,7 +272,6 @@ Possible values for the --pack NX option are: if a.share_local_folders is not None: a.share_local_folders = a.share_local_folders.split(',') - if a.server: ##### TODO: ssh_config to be moved into Python X2go!!!! -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 46/94: typo fix, adds debug code
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.1.4.0 in repository x2goclient. commit 1dcc2cf5770169ca4d325cb123fce18557c65bb6 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 17 09:17:49 2011 +0200 typo fix, adds debug code --- pyhoca/cli/frontend.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index 36bc76d1..bd7525d0 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -252,9 +252,11 @@ class PyHocaCLI(x2go.X2goClient): force_password_auth = True self._pyhoca_logger('interactive login for user %s' % self.args.username, loglevel=x2go.loglevel_NOTICE, ) self.args.password = getpass.getpass() + #if force_password_auth: raise(e) except x2go.PasswordRequiredException, e: - self._pyhoca_logger('interactive login for user %s' % self.args.username, loglevel=2go.loglevel_NOTICE, ) + self._pyhoca_logger('interactive login for user %s' % self.args.username, loglevel=x2go.loglevel_NOTICE, ) self.args.password = getpass.getpass() + #if force_password_auth: raise(e) except x2go.BadHostKeyException: self._runtime_error('SSH host key verification for remote host [%s]:%s failed' % (self.args.server, self.args.remote_ssh_port), exitcode=-254) except x2go.SSHException, e: -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 48/94: removal of debug code
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.1.4.0 in repository x2goclient. commit 473bfaf262e0ac2ec94f13877bd0eb97efafa3a5 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 17 09:39:31 2011 +0200 removal of debug code --- pyhoca/cli/frontend.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index bd7525d0..634d48ba 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -242,6 +242,7 @@ class PyHocaCLI(x2go.X2goClient): """ connected = False force_password_auth = False + _username = self.args.username or self._X2goClient__get_session_username(self.x2go_session_hash) try: while not connected: @@ -250,13 +251,11 @@ class PyHocaCLI(x2go.X2goClient): connected = True except x2go.AuthenticationException, e: force_password_auth = True - self._pyhoca_logger('interactive login for user %s' % self.args.username, loglevel=x2go.loglevel_NOTICE, ) + self._pyhoca_logger('interactive login for user »%s«' % _username, loglevel=x2go.loglevel_NOTICE, ) self.args.password = getpass.getpass() - #if force_password_auth: raise(e) except x2go.PasswordRequiredException, e: - self._pyhoca_logger('interactive login for user %s' % self.args.username, loglevel=x2go.loglevel_NOTICE, ) + self._pyhoca_logger('interactive login for user »%s«' % _username, loglevel=x2go.loglevel_NOTICE, ) self.args.password = getpass.getpass() - #if force_password_auth: raise(e) except x2go.BadHostKeyException: self._runtime_error('SSH host key verification for remote host [%s]:%s failed' % (self.args.server, self.args.remote_ssh_port), exitcode=-254) except x2go.SSHException, e: -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 42/94: updates for python build env
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.1.4.0 in repository x2goclient. commit a834627f1817f1de12c84a3a5f83adba093dd10e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 17 06:58:45 2011 +0200 updates for python build env --- debian/control | 2 +- debian/pycompat | 1 - debian/rules | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index 13508d68..d1762f25 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends: python-x2go Standards-Version: 3.9.1 Homepage: http://das-netzwerkteam.de/site/?q=node/71 -XS-Python-Version: all +XS-Python-Version: >=2.6 Package: pyhoca-cli Architecture: all diff --git a/debian/pycompat b/debian/pycompat deleted file mode 100644 index 0cfbf088..00000000 --- a/debian/pycompat +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/debian/rules b/debian/rules index ecc98712..df8b72ad 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,7 @@ # Based on sample debian/rules file - for GNU Hello (1.3). # Copyright 2010 by Mike Gabriel -#PYVERS=$(shell pyversions -vr) +PYVERS=$(shell pyversions -vr) %: dh ${@} -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 43/94: fixes --list-sessions option
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.1.4.0 in repository x2goclient. commit 7996e524268dbf221f11fff921952ece0bc77098 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue May 17 08:57:31 2011 +0200 fixes --list-sessions option --- pyhoca-cli | 1 + 1 file changed, 1 insertion(+) diff --git a/pyhoca-cli b/pyhoca-cli index bfb67b50..4b74424f 100755 --- a/pyhoca-cli +++ b/pyhoca-cli @@ -36,6 +36,7 @@ if app.startswith('./'): os.environ['PYTHONX2GO_LOCAL'] = '1' import time +import pprint import argparse import getpass import paramiko -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits