x2go-commits

x2go-commits@lists.x2go.org

1 participants
37903 discussions

[x2goclient] 37/94: fixes the author and his email address
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 043e16759991c3398e53380a4a0c10b7444f7f9e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Apr 15 00:03:50 2011 +0200 fixes the author and his email address --- man/pyhoca-cli.1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/man/pyhoca-cli.1 b/man/pyhoca-cli.1 index d0627675..08c646f2 100644 --- a/man/pyhoca-cli.1 +++ b/man/pyhoca-cli.1 @@ -169,4 +169,6 @@ rfb-hextile, rfb-tight, rfb-tight-compressed .SH "SEE ALSO" \fB/usr/share/doc/python-x2go\fR .SH AUTHOR -This manual has been written by Mike Gabriel <m.gabriel(a)das-netzwerkteam.de>. +This manual has been written by for the X2go project (http://www.x2go.org) by + +Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 36/94: diverted symlink for development python-x2go 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 5e41b9fb0b817717b8964e60306713e565b1f986 Author: Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> Date: Thu Feb 3 12:56:29 2011 +0100 diverted symlink for development python-x2go code --- x2go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x2go b/x2go index 3e762901..f4379813 120000 --- a/x2go +++ b/x2go @@ -1 +1 @@ -../../python/python-x2go/trunk/x2go \ No newline at end of file +../python-x2go/x2go \ No newline at end of file -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 32/94: Python X2go
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 002ed173bcb729ca42a2432d0abb310ed32f0727 Author: mike <mike@cdb5e8f1-f799-4276-8919-bce57fd91830> Date: Wed Dec 29 14:11:03 2010 +0000 Python X2go * added auto registration support for available server-side sessions * updating session registry regularly * HOOKs that notify the user on session interactions * session profile fixes (FILE backend) * added SSH proxy support to session profiles (not implemented yet) * ... PyHoca-GUI * profile manager now usable * added icons * using X2goClient HOOK methods now to inform the user about interactions * ... PyHoca-CLI * minor adaptation to changes in Python X2go (untested yet) git-svn-id: https://svn.das-netzwerkteam.de/x2go/pyhoca-cli/trunk@268 cdb5e8f1-f799-4276-8919-bce57fd91830 --- 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 e24d013f..838bfb3a 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -198,7 +198,7 @@ class PyHocaCLI(x2go.X2goClient): # initialize the X2goClient context and start the connection to the X2go server self._pyhoca_logger('preparing requested X2go session', x2go.loglevel_NOTICE, ) - x2go.X2goClient.__init__(self, use_cache=False, logger=liblogger) + x2go.X2goClient.__init__(self, logger=liblogger) _profiles = self._X2goClient__get_profiles() if self.args.session_profile and _profiles.has_profile(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] 34/94: * built Debian/Ubuntu Packages - Python X2go 0.0.28 - PyHoca-GUI 0.0.18 - PyHoca-CLI 0.1.3
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 ff3c42ca9acb10776f4b7328a8557a2072c7ebb9 Author: mike <mike@cdb5e8f1-f799-4276-8919-bce57fd91830> Date: Fri Dec 31 01:20:56 2010 +0000 * built Debian/Ubuntu Packages - Python X2go 0.0.28 - PyHoca-GUI 0.0.18 - PyHoca-CLI 0.1.3 git-svn-id: https://svn.das-netzwerkteam.de/x2go/pyhoca-cli/trunk@284 cdb5e8f1-f799-4276-8919-bce57fd91830 --- debian/changelog | 21 +++++++++++++++++---- debian/control | 2 +- pyhoca/cli/__init__.py | 2 +- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4ebeac7b..c1cfae3e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,27 +1,40 @@ +pyhoca-cli (0.1.3-0~nwt2) lucid maverick testing unstable; urgency=low + + * update Python X2go dependency + * added python-setproctitle as dependency + + -- Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> Fri, 31 Dec 2010 01:13:00 +0100 + +pyhoca-cli (0.1.3-0~nwt1) lucid maverick testing unstable; urgency=low + + * minor fix for new Python X2go version + + -- Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> Fri, 31 Dec 2010 00:28:00 +0100 + pyhoca-cli (0.1.2-0~nwt2) lucid maverick testing unstable; urgency=low * adapted code version - -- Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> Fri, 10 Dec 2010 13:46:00 +0200 + -- Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> Fri, 10 Dec 2010 13:46:00 +0100 pyhoca-cli (0.1.2-0~nwt1) lucid maverick testing unstable; urgency=low * disabled use_cache for X2goClient instance * depending on Python X2go 0.0.22 - -- Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> Fri, 10 Dec 2010 13:45:00 +0200 + -- Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> Fri, 10 Dec 2010 13:45:00 +0100 pyhoca-cli (0.1.1-0~nwt1) lucid maverick testing unstable; urgency=low * adapted to run with Python X2go v0.0.21 - -- Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> Thu, 09 Dec 2010 23:30:00 +0200 + -- Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> Thu, 09 Dec 2010 23:30:00 +0100 pyhoca-cli (0.1.0-0~nwt1) lucid maverick testing unstable; urgency=low * class'ified and egg'ified: PyHocaCLI is now a class - -- Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> Thu, 28 Oct 2010 23:30:00 +0200 + -- Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> Thu, 28 Oct 2010 23:30:00 +0100 pyhoca-cli (0.0.15-0~nwt1) lucid maverick testing unstable; urgency=low diff --git a/debian/control b/debian/control index 5d6cc6aa..26f8e162 100644 --- a/debian/control +++ b/debian/control @@ -9,6 +9,6 @@ XS-Python-Version: all Package: pyhoca-cli Architecture: all -Depends: ${misc:Depends}, python, python-x2go (>=0.0.22-0~nwt1), python-argparse +Depends: ${misc:Depends}, python, python-x2go (>=0.0.28-0~nwt1), python-argparse, python-setproctitle Description: An command line X2go client written in Python A command line X2go client implementation written in Python. diff --git a/pyhoca/cli/__init__.py b/pyhoca/cli/__init__.py index 86f50bb8..c6b92866 100644 --- a/pyhoca/cli/__init__.py +++ b/pyhoca/cli/__init__.py @@ -20,6 +20,6 @@ """\ STILL UNDOCUMENTED """ -__VERSION__ = "0.1.2" +__VERSION__ = "0.1.3" from frontend import * \ No newline at end of file -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 33/94: * fixing handling of add_to_known_hosts and known_hosts parameters
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 516921e6e1fc5f62af55aaa8bd670c66aca6a55e Author: mike <mike@cdb5e8f1-f799-4276-8919-bce57fd91830> Date: Thu Dec 30 23:10:32 2010 +0000 * fixing handling of add_to_known_hosts and known_hosts parameters git-svn-id: https://svn.das-netzwerkteam.de/x2go/pyhoca-cli/trunk@281 cdb5e8f1-f799-4276-8919-bce57fd91830 --- pyhoca/cli/frontend.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index 838bfb3a..bdda1d4a 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -1,4 +1,3 @@ -#!/usr/bin/python # -*- coding: utf-8 -*- # Copyright (C) 2010 by Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> @@ -44,6 +43,7 @@ def _touch_file(filename): f = open(filename, 'w') f.close() + # define and create known_hosts file (if not there) ssh_known_hosts_filename = os.path.join(x2go.LOCAL_HOME, x2go.X2GO_SSH_ROOTDIR, 'known_hosts') if not os.path.isfile(ssh_known_hosts_filename): @@ -53,6 +53,7 @@ ssh_config_filename = os.path.join(x2go.LOCAL_HOME, x2go.X2GO_SSH_ROOTDIR, 'conf if not os.path.isfile(ssh_config_filename): _touch_file(ssh_config_filename) + # sometimes we have to fail... def runtime_error(m, parser=None, exitcode=-1): """\ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 31/94: * modified version string
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 7a1e35b059a4b41d9b937856556b2c434143eba0 Author: mike <mike@cdb5e8f1-f799-4276-8919-bce57fd91830> Date: Fri Dec 10 12:59:15 2010 +0000 * modified version string git-svn-id: https://svn.das-netzwerkteam.de/x2go/pyhoca-cli/trunk@177 cdb5e8f1-f799-4276-8919-bce57fd91830 --- debian/changelog | 6 ++++++ pyhoca-cli | 3 ++- pyhoca/cli/__init__.py | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a1e1e7f7..4ebeac7b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pyhoca-cli (0.1.2-0~nwt2) lucid maverick testing unstable; urgency=low + + * adapted code version + + -- Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> Fri, 10 Dec 2010 13:46:00 +0200 + pyhoca-cli (0.1.2-0~nwt1) lucid maverick testing unstable; urgency=low * disabled use_cache for X2goClient instance diff --git a/pyhoca-cli b/pyhoca-cli index 1e1ce6f5..bfb67b50 100755 --- a/pyhoca-cli +++ b/pyhoca-cli @@ -54,7 +54,8 @@ from pyhoca.cli import current_home, PyHocaCLI, runtime_error # version information PROG_NAME = os.path.basename(sys.argv[0]) PROG_PID = os.getpid() -VERSION="0.1.1" +from pyhoca.cli import __VERSION__ as _version +VERSION=_version VERSION_TEXT=""" %s[%s] - an X2go command line client written in Python ---------------------------------------------------------------------- diff --git a/pyhoca/cli/__init__.py b/pyhoca/cli/__init__.py index e26185a2..86f50bb8 100644 --- a/pyhoca/cli/__init__.py +++ b/pyhoca/cli/__init__.py @@ -20,6 +20,6 @@ """\ STILL UNDOCUMENTED """ -__VERSION__ = "0.1.1" +__VERSION__ = "0.1.2" from frontend import * \ No newline at end of file -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 29/94: * forcing use_cache to False when constructing X2goClient instance
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 997f5726ccc395c7815b8718c5d722e8f69c525f Author: mike <mike@cdb5e8f1-f799-4276-8919-bce57fd91830> Date: Fri Dec 10 12:23:05 2010 +0000 * forcing use_cache to False when constructing X2goClient instance git-svn-id: https://svn.das-netzwerkteam.de/x2go/pyhoca-cli/trunk@172 cdb5e8f1-f799-4276-8919-bce57fd91830 --- 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 838bfb3a..e24d013f 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -198,7 +198,7 @@ class PyHocaCLI(x2go.X2goClient): # initialize the X2goClient context and start the connection to the X2go server self._pyhoca_logger('preparing requested X2go session', x2go.loglevel_NOTICE, ) - x2go.X2goClient.__init__(self, logger=liblogger) + x2go.X2goClient.__init__(self, use_cache=False, logger=liblogger) _profiles = self._X2goClient__get_profiles() if self.args.session_profile and _profiles.has_profile(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] 30/94: * tagged pyhoca-cli 0.1.2
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 43ae1606083db9a0ba78a60afa024870371790c8 Author: mike <mike@cdb5e8f1-f799-4276-8919-bce57fd91830> Date: Fri Dec 10 12:45:42 2010 +0000 * tagged pyhoca-cli 0.1.2 git-svn-id: https://svn.das-netzwerkteam.de/x2go/pyhoca-cli/trunk@175 cdb5e8f1-f799-4276-8919-bce57fd91830 --- debian/changelog | 7 +++++++ debian/control | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 40c199fa..a1e1e7f7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +pyhoca-cli (0.1.2-0~nwt1) lucid maverick testing unstable; urgency=low + + * disabled use_cache for X2goClient instance + * depending on Python X2go 0.0.22 + + -- Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> Fri, 10 Dec 2010 13:45:00 +0200 + pyhoca-cli (0.1.1-0~nwt1) lucid maverick testing unstable; urgency=low * adapted to run with Python X2go v0.0.21 diff --git a/debian/control b/debian/control index 0888b34c..5d6cc6aa 100644 --- a/debian/control +++ b/debian/control @@ -9,6 +9,6 @@ XS-Python-Version: all Package: pyhoca-cli Architecture: all -Depends: ${misc:Depends}, python, python-x2go (>=0.0.21-0~nwt1), python-argparse +Depends: ${misc:Depends}, python, python-x2go (>=0.0.22-0~nwt1), python-argparse Description: An command line X2go client written in Python A command line X2go client implementation written in Python. -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 28/94: * prepared for intermediate release * updated documentation (not readable, full of errors, but epydoc builds doc again) * renamed icons' path * disabling options and profilemanager menu for release builds * next commit will add new files...
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 57cf611b68eb59339c15cc18bd5afe8d3d15be59 Author: mike <mike@cdb5e8f1-f799-4276-8919-bce57fd91830> Date: Fri Dec 10 07:46:59 2010 +0000 * prepared for intermediate release * updated documentation (not readable, full of errors, but epydoc builds doc again) * renamed icons' path * disabling options and profilemanager menu for release builds * next commit will add new files... git-svn-id: https://svn.das-netzwerkteam.de/x2go/pyhoca-cli/trunk@165 cdb5e8f1-f799-4276-8919-bce57fd91830 --- debian/changelog | 6 ++++++ debian/control | 2 +- pyhoca-cli | 2 +- pyhoca/cli/__init__.py | 2 +- pyhoca/cli/frontend.py | 6 +++--- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0ff76868..40c199fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pyhoca-cli (0.1.1-0~nwt1) lucid maverick testing unstable; urgency=low + + * adapted to run with Python X2go v0.0.21 + + -- Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> Thu, 09 Dec 2010 23:30:00 +0200 + pyhoca-cli (0.1.0-0~nwt1) lucid maverick testing unstable; urgency=low * class'ified and egg'ified: PyHocaCLI is now a class diff --git a/debian/control b/debian/control index 559181ae..0888b34c 100644 --- a/debian/control +++ b/debian/control @@ -9,6 +9,6 @@ XS-Python-Version: all Package: pyhoca-cli Architecture: all -Depends: ${misc:Depends}, python, python-x2go (>=0.0.14-0~nwt1), python-argparse +Depends: ${misc:Depends}, python, python-x2go (>=0.0.21-0~nwt1), python-argparse Description: An command line X2go client written in Python A command line X2go client implementation written in Python. diff --git a/pyhoca-cli b/pyhoca-cli index 9a8dab28..1e1ce6f5 100755 --- a/pyhoca-cli +++ b/pyhoca-cli @@ -54,7 +54,7 @@ from pyhoca.cli import current_home, PyHocaCLI, runtime_error # version information PROG_NAME = os.path.basename(sys.argv[0]) PROG_PID = os.getpid() -VERSION="0.1.0" +VERSION="0.1.1" VERSION_TEXT=""" %s[%s] - an X2go command line client written in Python ---------------------------------------------------------------------- diff --git a/pyhoca/cli/__init__.py b/pyhoca/cli/__init__.py index aaeed7ba..e26185a2 100644 --- a/pyhoca/cli/__init__.py +++ b/pyhoca/cli/__init__.py @@ -20,6 +20,6 @@ """\ STILL UNDOCUMENTED """ -__VERSION__ = "0.1.0" +__VERSION__ = "0.1.1" from frontend import * \ No newline at end of file diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index ddc986dc..838bfb3a 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -251,7 +251,7 @@ class PyHocaCLI(x2go.X2goClient): while not connected: try: - self._X2goClient__connect_session(self.x2go_session_hash, password=self.args.password, force_password_auth=force_password_auth) + self._X2goClient__connect_session(self.x2go_session_hash, force_password_auth=force_password_auth) connected = True except x2go.AuthenticationException: force_password_auth = True @@ -346,5 +346,5 @@ class PyHocaCLI(x2go.X2goClient): self._pyhoca_logger("X2go session %s has been suspended" % session_name, x2go.loglevel_NOTICE, ) except x2go.X2goSessionException, e: - self._pyhoca_logger("X2goSessionException occured:", x2go.loglevel_ERROR, ) - self._pyhoca_logger("-> %s" % str(e), x2go.loglevel_ERROR, ) + self._pyhoca_logger("X2goSessionException occured:", loglevel=x2go.loglevel_ERROR) + self._pyhoca_logger("-> %s" % str(e), 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] 26/94: * added known_host kwarg to X2goClient__register_session * added code that recognizes if we are running from development dir or from /usr/bin * some minor changes
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 6c88a4ca7be0ccf9983a0e31baab8bff014865f5 Author: mike <mike@cdb5e8f1-f799-4276-8919-bce57fd91830> Date: Thu Dec 2 14:19:13 2010 +0000 * added known_host kwarg to X2goClient__register_session * added code that recognizes if we are running from development dir or from /usr/bin * some minor changes git-svn-id: https://svn.das-netzwerkteam.de/x2go/pyhoca-cli/trunk@112 cdb5e8f1-f799-4276-8919-bce57fd91830 --- pyhoca-cli | 17 ++++++++++++----- pyhoca/cli/frontend.py | 13 +++++++------ pyhoca/cli/x2go | 1 - 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/pyhoca-cli b/pyhoca-cli index 50129691..9a8dab28 100755 --- a/pyhoca-cli +++ b/pyhoca-cli @@ -26,17 +26,21 @@ ### module section ### -import sys, os +import x2go + +import sys +import os +app = sys.argv[0] +if app.startswith('./'): + sys.path.insert(0, os.path.join(os.path.dirname(__file__))) + os.environ['PYTHONX2GO_LOCAL'] = '1' + import time import argparse import getpass -import x2go import paramiko from types import * -# for debugging -import pprint - # Python X2go provides the current local username (OS independent) from x2go.defaults import CURRENT_LOCAL_USER as current_user @@ -181,6 +185,9 @@ Possible values for the --pack NX option are: if a.username is None: a.username = current_user + # statically no password from the command line + a.password = None + # time-to-wait needs to be an integer try: a.time_to_wait = int(a.time_to_wait) diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index a4c5aefd..80a5d47b 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -22,13 +22,12 @@ # 2010 Dick Kniep <dick.kniep(a)lindix.nl> # 2010 Jörg Sawatzki <joerg.sawatzki(a)web.de> +import x2go import sys import os import copy import time import getpass -import x2go -import paramiko from types import * from gevent import socket @@ -142,7 +141,7 @@ class PyHocaCLI(x2go.X2goClient): if self.args.session_profile is None: self.logger('command for new session is: %s' % self.args.command, loglevel=x2go.loglevel_DEBUG, ) else: - self.logger('command from session profile to run is: %s' % self.session_registry(self.x2go_session_hash).session_params['cmd'], loglevel=x2go.loglevel_DEBUG, ) + self.logger('command from session profile to run is: %s' % self.session_registry(self.x2go_session_hash).get_session_cmd(), loglevel=x2go.loglevel_DEBUG, ) self._X2goClient__start_session(s_hash) @@ -212,12 +211,16 @@ class PyHocaCLI(x2go.X2goClient): kwargs[a] = v # setup up the session profile based X2go session - self.x2go_session_hash = self._X2goClient__register_session(profile_name=self.args.session_profile, **kwargs) + self.x2go_session_hash = self._X2goClient__register_session(profile_name=self.args.session_profile, + known_hosts=ssh_known_hosts_filename, + **kwargs + ) else: # 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, password=self.args.password, key_filename=self.args.ssh_privkey, @@ -237,8 +240,6 @@ class PyHocaCLI(x2go.X2goClient): share_local_folders=self.args.share_local_folders, cmd=self.args.command) - self.with_session(self.x2go_session_hash).load_host_keys(ssh_known_hosts_filename) - def authenticate(self): """\ diff --git a/pyhoca/cli/x2go b/pyhoca/cli/x2go deleted file mode 120000 index b7003701..00000000 --- a/pyhoca/cli/x2go +++ /dev/null @@ -1 +0,0 @@ -../../../../python/python-x2go/trunk/x2go \ No newline at end of file -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits