x2go-commits August 2011

x2go-commits@lists.x2go.org

1 participants
75 discussions

nxcomp.git - master (branch) updated: 3.4.0.8-13-g6c00c20
by git-admin＠x2go.org 17 Aug '11

17 Aug '11

The branch, master has been updated via 6c00c20e5d12062ad6944109401df5780369e35c (commit) from fa3c1ddecc22c1b1a50a82185e0cf69d3d08b28c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 6c00c20e5d12062ad6944109401df5780369e35c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Aug 17 17:44:52 2011 +0200 spelling fix... ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index d338d1e..3325c9e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,7 +10,7 @@ nxcomp (3.5.0-1-0~x2go1) UNRELEASED; urgency=low * Breaks/replaces nxcomp package. [ Ivan Kabaivanov ] - * Tarballer installer fix. + * Tarball installer fix. -- Reinhard Tartler <siretart(a)tauware.de> Wed, 29 Jun 2011 15:41:10 +0200 hooks/post-receive -- nxcomp.git (NX comp library) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "nxcomp.git" (NX comp library).

1 0

nxcomp.git - master (branch) updated: 3.4.0.8-12-gfa3c1dd
by git-admin＠x2go.org 17 Aug '11

17 Aug '11

The branch, master has been updated via fa3c1ddecc22c1b1a50a82185e0cf69d3d08b28c (commit) from e4e92822acabf95e460371582683ef8b03248438 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit fa3c1ddecc22c1b1a50a82185e0cf69d3d08b28c Author: Ivan Kabaivanov <chepati(a)yahoo.com> Date: Wed Aug 17 17:40:33 2011 +0200 Tarballer installer fix. ----------------------------------------------------------------------- Summary of changes: Makefile.in | 2 +- debian/changelog | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/Makefile.in b/Makefile.in index 109f147..d695661 100644 --- a/Makefile.in +++ b/Makefile.in @@ -274,7 +274,7 @@ install.bin: install.lib: all ./mkinstalldirs $(DESTDIR)$(prefix)/lib ./mkinstalldirs $(DESTDIR)$(prefix)/include - $(INSTALL) $(DESTDIR)$(prefix)/lib + $(INSTALL) -d $(DESTDIR)$(prefix)/lib $(INSTALL_DATA) libXcomp.so.3.* $(DESTDIR)$(prefix)/lib $(INSTALL_LINK) libXcomp.so.3 $(DESTDIR)$(prefix)/lib $(INSTALL_LINK) libXcomp.so $(DESTDIR)$(prefix)/lib diff --git a/debian/changelog b/debian/changelog index bc6aedc..d338d1e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ nxcomp (3.5.0-1-0~x2go1) UNRELEASED; urgency=low * Don't let Makefile run fail if ldconfig fails. * Breaks/replaces nxcomp package. + [ Ivan Kabaivanov ] + * Tarballer installer fix. + -- Reinhard Tartler <siretart(a)tauware.de> Wed, 29 Jun 2011 15:41:10 +0200 nxcomp (3.4.0.8-0~x2go1) unstable; urgency=low hooks/post-receive -- nxcomp.git (NX comp library) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "nxcomp.git" (NX comp library).

1 0

nxcompext.git - master (branch) updated: 3.4.0.2-12-g405482c
by git-admin＠x2go.org 17 Aug '11

17 Aug '11

The branch, master has been updated via 405482cda26c23aea234ea6909ca8eb257cb5b13 (commit) via 600da22725e6b03fb7ac340fc0990706d8e4707e (commit) from 91acae00388848f9068ffd421d955036cf059174 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 405482cda26c23aea234ea6909ca8eb257cb5b13 Author: Reinhard Tartler <siretart(a)tauware.de> Date: Wed Aug 17 13:49:04 2011 +0200 Add -dbg package commit 600da22725e6b03fb7ac340fc0990706d8e4707e Author: Reinhard Tartler <siretart(a)tauware.de> Date: Wed Aug 17 13:50:38 2011 +0200 remove self references in breaks and replaces fields ----------------------------------------------------------------------- Summary of changes: debian/control | 19 +++++++++++++++++-- debian/rules | 5 ++++- 2 files changed, 21 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/control b/debian/control index 3313fa0..63de454 100644 --- a/debian/control +++ b/debian/control @@ -43,8 +43,8 @@ Depends: libxcomp-dev, x11proto-core-dev, libx11-dev -Breaks: nxcompext-dev, libxcompext-dev -Replaces: nxcompext-dev, libxcompext-dev +Breaks: nxcompext-dev +Replaces: nxcompext-dev Description: NX X11 protocol compression extensions library NX is a software suite from NoMachine which implements very efficient compression of the X11 protocol. This increases performance when @@ -53,3 +53,18 @@ Description: NX X11 protocol compression extensions library libXcompext extends the core NX library with additional features. . This package contains the development files for the nxcompext library. + +Package: libxcompext-dbg +Architecture: any +Section: debug +Priority: extra +Depends: + libxcompext3 (= ${binary:Version}), + ${misc:Depends} +Description: NX X11 protocol compression extensions library + NX is a software suite from NoMachine which implements very efficient + compression of the X11 protocol. This increases performance when + using X applications over a network, especially a slow one. + . + This package contains the debug symbols for the libxcompext3 library. + diff --git a/debian/rules b/debian/rules index 45bc4c7..5feb4d5 100755 --- a/debian/rules +++ b/debian/rules @@ -3,4 +3,7 @@ %: dh --with autoreconf --parallel $@ -override_dh_auto_install: \ No newline at end of file +override_dh_auto_install: + +override_dh_strip: + dh_strip --dbg-package=libxcompext-dbg hooks/post-receive -- nxcompext.git (NX compext library) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "nxcompext.git" (NX compext library).

1 0

nxcomp.git - master (branch) updated: 3.4.0.8-11-ge4e9282
by git-admin＠x2go.org 17 Aug '11

17 Aug '11

The branch, master has been updated via e4e92822acabf95e460371582683ef8b03248438 (commit) via 013e898cbd8f435cd5d7276e64c163f7c63212bd (commit) from 68b507b01d1a7aeab734a2955ddb2d513dbe8ace (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e4e92822acabf95e460371582683ef8b03248438 Author: Reinhard Tartler <siretart(a)tauware.de> Date: Wed Aug 17 13:45:01 2011 +0200 add package libxcomp-dbg that ships debug symbols of libxcomp commit 013e898cbd8f435cd5d7276e64c163f7c63212bd Author: Reinhard Tartler <siretart(a)tauware.de> Date: Wed Aug 17 13:42:19 2011 +0200 fix dependency declarations of libxcomp-dev ----------------------------------------------------------------------- Summary of changes: debian/control | 17 ++++++++++++++--- debian/rules | 5 ++++- 2 files changed, 18 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/control b/debian/control index 644fc39..d1137b6 100644 --- a/debian/control +++ b/debian/control @@ -34,12 +34,23 @@ Package: libxcomp-dev Section: libdevel Architecture: any Depends: - libxcoBmp3 (= ${binary:Version}), + libxcomp3 (= ${binary:Version}), ${misc:Depends} -Breaks: nxcomp-dev, libxcomp-dev -Replaces: nxcomp-dev, libxcomp-dev +Breaks: nxcomp-dev +Replaces: nxcomp-dev Description: NX X compression library-headers NX provides a differential X compression library for X11. . This package provides the compression library headers. +Package: libxcomp-dbg +Priority: extra +Section: debug +Architecture: any +Depends: + libxcomp3 (= ${binary:Version}), + ${misc:Depends} +Description: NX X compression debug symbols + NX provides a differential X compression library for X11. + . + This package provides debug symbols for the libxcomp3 library. diff --git a/debian/rules b/debian/rules index 922b9bc..e98f075 100755 --- a/debian/rules +++ b/debian/rules @@ -3,4 +3,7 @@ %: dh --with autoreconf --parallel $@ -override_dh_auto_install: \ No newline at end of file +override_dh_auto_install: + +override_dh_strip: + dh_strip --dbg-package=libxcomp-dbg hooks/post-receive -- nxcomp.git (NX comp library) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "nxcomp.git" (NX comp library).

1 0

pyhoca-cli.git - master (branch) updated: 0.1.4.1-7-gd5c1ff7
by git-admin＠x2go.org 17 Aug '11

17 Aug '11

The branch, master has been updated via d5c1ff7f2e31a150aa241acd7317fabb940e5439 (commit) via 1d7da12b3de5787b7ada39333601bccbe50f4c5c (commit) from 37ba4e6f7dfa24bf27cab76c6588344da5a6b4a4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d5c1ff7f2e31a150aa241acd7317fabb940e5439 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Aug 17 02:28:02 2011 +0200 Update+rearrange man page. commit 1d7da12b3de5787b7ada39333601bccbe50f4c5c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Aug 17 02:27:57 2011 +0200 Add cmd line option --terminate-on-ctrl-c. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + man/man1/pyhoca-cli.1 | 22 +++++++++++++++------- pyhoca-cli | 1 + pyhoca/cli/frontend.py | 8 ++++++++ 4 files changed, 25 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 981b6c5..17142c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ pyhoca-cli (0.1.4.2-0~x2go1) UNRELEASED; urgency=low all sessions of the connecting user. - Allow ,,NEWEST'' and ,,OLDEST'' as session name when resuming (closes upstream issue #86). + - Add cmd line option --terminate-on-ctrl-c. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 06 Jul 2011 22:18:01 +0200 diff --git a/man/man1/pyhoca-cli.1 b/man/man1/pyhoca-cli.1 index 8911f3b..35678ff 100644 --- a/man/man1/pyhoca-cli.1 +++ b/man/man1/pyhoca-cli.1 @@ -54,10 +54,16 @@ Enable debugging code of the unterlying Python X2go module. .TP \*(T<\fB\-\-libdebug-sftpxfer\fR\*(T> Enable debugging code of Python X2go's sFTP server code (very verbose, and it may even reveal promiscuous data). -.SH SERVER +.SH SERVER / SESSION PROFILE +You either have to specify a server name or a pre-configured X2goClient session profile to tell \fBpyhoca-cli\fR to +what X2go server to connect. \fBpyhoca-cli\fR will not start +if neither of these two options has been given on the command line. .TP \*(T<\fB\-\-server\fR \fI<HOSTNAME_or_IP>\fR\*(T> If not in LDAP mode you always have to name the remote X2go server's hostname or IP address. +.TP +\*(T<\fB\-P, \-\-session-profile\fR \fI<SESSION_PROFILE_NAME>\fR\*(T> +The name of the session profile to be used to make the connection. .SH ACTIONS \fBpyhoca-cli\fR accepts exclusively one of the listed actions: .TP @@ -81,11 +87,16 @@ Terminate running X2go session <SESSION_NAME>. A special value for <SESSION_NAME .TP \*(T<\fB\-L, \-\-list-sessions\fR\*(T> List user's X2go sessions on server. +.SH ACTION OPTIONS +\fBpyhoca-cli\fR actions can be tweaked by these options: +.TP +\*(T<\fB\-\-clean-sessions\fR\*(T> +Clean all of the user's suspended/running sessions before starting a new one on the named X2go server. +.TP +\*(T<\fB\-\-terminate-on-ctrl-c\fR\*(T> +Terminate the connected session when pressing CTRL+C (instead of suspending the session). .SH X2GO OPTIONS .TP -\*(T<\fB\-P, \-\-session-profile\fR\*(T> -The name of the session profile to be used to make the connection.B -.TP \*(T<\fB\-c, \-\-command\fR \fI<CMD>\fR\*(T> Command to run with \fB\-\-new\fR mode on server (default: xterm). .TP @@ -117,9 +128,6 @@ Use X2go printing (default: disabled). .TP \*(T<\fB\-\-share-mode\fR \fI{0|1}\fR\*(T> Share mode for X2go desktop sharing (0: view-only, 1: full access). -.TP -\*(T<\fB\-\-clean-sessions\fR\*(T> -Clean all of the user's suspended/running sessions before starting a new one on the named X2go server. .TP \*(T<\fB\-\-time-to-wait\fR\*(T> Time to wait for session startup/resume (default: 8s). There should be no need to touch this, unless on very slow network connections. diff --git a/pyhoca-cli b/pyhoca-cli index 71f7591..741f9cd 100755 --- a/pyhoca-cli +++ b/pyhoca-cli @@ -122,6 +122,7 @@ x2go_options = [ {'args':['--share-mode'], 'default': 0, 'help': 'share mode for X2go desktop sharing (0: view-only, 1: full access)', }, {'args':['-F', '--share-local-folders'], 'metavar': '<folder1>[,<folder2[,...]]', 'default': None, 'help': 'a comma separated list of local folder names to mount in the X2go session', }, {'args':['--clean-sessions'], 'default': False, 'action': 'store_true', 'help': 'clean all suspended sessions before starting a new one', }, + {'args':['--terminate-on-ctrl-c'], 'default': False, 'action': 'store_true', 'help': 'terminate the connected session when pressing CTRL+C (instead of suspending the session)', }, {'args':['--time-to-wait'], 'default': '8', 'help': 'time to wait for session startup/resume (default: 8s)', }, ] print_options = [ diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index 82487d4..e5b3672 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -441,6 +441,8 @@ class PyHocaCLI(x2go.X2goClient): self._pyhoca_logger("X2go session name is: %s" % session_name, loglevel=x2go.loglevel_INFO, ) if self.args.share_desktop: self._pyhoca_logger("Press CTRL+C to end desktop sharing for this session...", loglevel=x2go.loglevel_NOTICE, ) + elif self.args.terminate_on_ctrl_c: + self._pyhoca_logger("Press CTRL+C to terminate the running session...", loglevel=x2go.loglevel_NOTICE, ) else: self._pyhoca_logger("Press CTRL+C to suspend the running session...", loglevel=x2go.loglevel_NOTICE, ) @@ -469,6 +471,12 @@ class PyHocaCLI(x2go.X2goClient): self._X2goClient__terminate_session(self.x2go_session_hash) time.sleep(2) self._pyhoca_logger("X2go session %s has been terminated" % session_name, loglevel=x2go.loglevel_NOTICE, ) + elif self.args.terminate_on_ctrl_c: + self._pyhoca_logger("Terminating X2go session %s" % session_name, loglevel=x2go.loglevel_INFO, ) + self._X2goClient__terminate_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 terminated" % session_name, loglevel=x2go.loglevel_NOTICE, ) else: self._pyhoca_logger("Suspending X2go session %s" % session_name, loglevel=x2go.loglevel_INFO, ) self._X2goClient__suspend_session(self.x2go_session_hash) hooks/post-receive -- pyhoca-cli.git (Python X2go Client (command line client)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-cli.git" (Python X2go Client (command line client)).

1 0

pyhoca-cli.git - master (branch) updated: 0.1.4.1-5-g37ba4e6
by git-admin＠x2go.org 17 Aug '11

17 Aug '11

The branch, master has been updated via 37ba4e6f7dfa24bf27cab76c6588344da5a6b4a4 (commit) from 3e307a9bfbb2f945dcb8c887b122cd8bb9087b4b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 37ba4e6f7dfa24bf27cab76c6588344da5a6b4a4 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Aug 17 02:07:09 2011 +0200 man page update ----------------------------------------------------------------------- Summary of changes: man/man1/pyhoca-cli.1 | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/man/man1/pyhoca-cli.1 b/man/man1/pyhoca-cli.1 index 7fa18a0..8911f3b 100644 --- a/man/man1/pyhoca-cli.1 +++ b/man/man1/pyhoca-cli.1 @@ -65,7 +65,8 @@ If not in LDAP mode you always have to name the remote X2go server's hostname or Start a new X2go session on server (default mode if no mode is explicitly specified). .TP \*(T<\fB\-R, \-\-resume\fR \fI<SESSION_NAME>\fR\*(T> -Resume existing X2go session <SESSION_NAME> on server. +Resume existing X2go session <SESSION_NAME> on server. Special values for <SESSION_NAME> are ,,NEWEST'' (will resume youngest session) +or ,,OLDEST'' (resume session with oldest timestamp). .TP \*(T<\fB\-D, \-\-share-desktop\fR \fI<USER>@<DISPLAY>\fR\*(T> Share an X2go session on the remote server specified by <USER>@<DISPLAY>, @@ -73,10 +74,10 @@ whereas <USER> can be the same user that is starting the share mode session or a other user that grants X2go desktop sharing for the current user. .TP \*(T<\fB\-S, \-\-suspend\fR \fI<SESSION_NAME>\fR\*(T> -Suspend running X2go session <SESSION_NAME>. +Suspend running X2go session <SESSION_NAME>. A special value for <SESSION_NAME> is ,,ALL'' (will suspend all sessions of the connected user). .TP \*(T<\fB\-T, \-\-terminate\fR \fI<SESSION_NAME>\fR\*(T> -Terminate running X2go session <SESSION_NAME> . +Terminate running X2go session <SESSION_NAME>. A special value for <SESSION_NAME> is ,,ALL'' (will terminate all sessions of the connected user). .TP \*(T<\fB\-L, \-\-list-sessions\fR\*(T> List user's X2go sessions on server. hooks/post-receive -- pyhoca-cli.git (Python X2go Client (command line client)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-cli.git" (Python X2go Client (command line client)).

1 0

pyhoca-cli.git - master (branch) updated: 0.1.4.1-4-g3e307a9
by git-admin＠x2go.org 17 Aug '11

17 Aug '11

The branch, master has been updated via 3e307a9bfbb2f945dcb8c887b122cd8bb9087b4b (commit) from cde819a720c1ae037c56e2b2f81d0c19a86ca244 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 3e307a9bfbb2f945dcb8c887b122cd8bb9087b4b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Aug 17 02:03:22 2011 +0200 Multiple achievements with this commit... 1. Translate cmd line options into python-x2go options 2. Allow ,,ALL'' as session name when suspending -> will suspend all sessions of the connecting user. 3. Allow ,,ALL'' as session name when terminating -> will terminate all sessions of the connecting user. 4. Allow ,,NEWEST'' and ,,OLDEST'' as session name when resuming (closes upstream issue #86). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 8 ++++- pyhoca-cli | 4 +- pyhoca/cli/frontend.py | 87 +++++++++++++++++++++++++++++++++++++++++------- 3 files changed, 84 insertions(+), 15 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index d4cdc19..981b6c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,13 @@ pyhoca-cli (0.1.4.2-0~x2go1) UNRELEASED; urgency=low * New upstream version (0.1.4.2): - - nothing yet + - Translate cmd line options into python-x2go options + - Allow ,,ALL'' as session name when suspending -> will suspend + all sessions of the connecting user. + - Allow ,,ALL'' as session name when terminating -> will terminate + all sessions of the connecting user. + - Allow ,,NEWEST'' and ,,OLDEST'' as session name when resuming (closes + upstream issue #86). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 06 Jul 2011 22:18:01 +0200 diff --git a/pyhoca-cli b/pyhoca-cli index 34fb297..71f7591 100755 --- a/pyhoca-cli +++ b/pyhoca-cli @@ -220,9 +220,9 @@ Possible values for the --pack NX option are: if not (a.session_profile or a.list_profiles): - # the --server options is required for most operations + # the --server (or --session-profile) option is required for most operations if not a.server: - runtime_error ("argument --server is required", parser=p, exitcode=1) + runtime_error ("argument --server (or --session-profile) is required", parser=p, exitcode=1) # check for mutual exclusiveness of -N, -R, -S, -T and -L, -N is default if none of them is set if bool(a.new) + bool(a.resume) + bool(a.share_desktop) + bool(a.suspend) + bool(a.terminate) + bool(a.list_sessions) + bool(a.list_desktops) + bool(a.list_profiles)> 1: diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index 8931e3d..82487d4 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -166,6 +166,24 @@ class PyHocaCLI(x2go.X2goClient): 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) + def _auto_resume_newest(self, s_hash): + session_infos = self._X2goClient__list_sessions(s_hash) + if session_infos: + newest_session_name = x2go.utils.session_names_by_timestamp(session_infos)[-1] + self._pyhoca_logger("Resuming newest X2go session %s..." % newest_session_name, loglevel=x2go.loglevel_NOTICE, ) + self._X2goClient__resume_session(s_hash, newest_session_name) + return True + return False + + def _auto_resume_oldest(self, s_hash): + session_infos = self._X2goClient__list_sessions(s_hash) + if session_infos: + oldest_session_name = x2go.utils.session_names_by_timestamp(session_infos)[0] + self._pyhoca_logger("Resuming oldest X2go session %s..." % oldest_session_name, loglevel=x2go.loglevel_NOTICE, ) + self._X2goClient__resume_session(s_hash, oldest_session_name) + return True + return False + def resume_session(self, s_hash): """\ STILL UNDOCUMENTED @@ -173,7 +191,11 @@ class PyHocaCLI(x2go.X2goClient): # resume a running session 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(): + if available_sessions and self.args.resume == 'OLDEST': + self._auto_resume_oldest(s_hash) + elif available_sessions and self.args.resume == 'NEWEST': + self._auto_resume_newest(s_hash) + elif self.args.resume in available_sessions.keys(): self._X2goClient__resume_session(s_hash, self.args.resume) else: self._runtime_error('requested session not available on X2go server [%s]:%s' % (self.args.server, self.args.remote_ssh_port), exitcode=20) @@ -199,26 +221,54 @@ class PyHocaCLI(x2go.X2goClient): # send a suspend request to a session 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) + + if self.args.suspend == "ALL": + _session_names = available_sessions else: - self._runtime_error('requested session not available on X2go server [%s]:%s' % (self.args.server, self.args.remote_ssh_port), exitcode=21) + _session_names = [ self.args.suspend ] + + for _session_name in _session_names: + if _session_name in available_sessions.keys(): + self._X2goClient__suspend_session(s_hash, _session_name) + self._pyhoca_logger("X2go session %s has been suspended" % _session_name, loglevel=x2go.loglevel_NOTICE, ) + else: + _server = self.args.server + _remote_ssh_port = self.args.remote_ssh_port + if not self.args.server and self.args.session_profile: + _server = self.session_profiles.get_value(self.session_profiles.to_profile_id(self.args.session_profile), 'host') + _remote_ssh_port = self.session_profiles.get_value(self.session_profiles.to_profile_id(self.args.session_profile), 'sshport') + self._runtime_error('session %s not available on X2go server [%s]:%s' % (_session_name, _server, _remote_ssh_port), exitcode=21) def terminate_session(self, s_hash): """\ STILL UNDOCUMENTED + """ # send a terminate request to a session 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) + + if self.args.terminate == "ALL": + _session_names = available_sessions else: - self._runtime_error('requested session not available on X2go server [%s]:%s' % (self.args.server, self.args.remote_ssh_port), exitcode=22) + _session_names = [ self.args.terminate ] + + for _session_name in _session_names: + if _session_name in available_sessions.keys(): + self._X2goClient__terminate_session(s_hash, _session_name) + self._pyhoca_logger("X2go session %s has been terminated" % _session_name, loglevel=x2go.loglevel_NOTICE, ) + else: + _server = self.args.server + _remote_ssh_port = self.args.remote_ssh_port + if not self.args.server and self.args.session_profile: + _server = self.session_profiles.get_value(self.session_profiles.to_profile_id(self.args.session_profile), 'host') + _remote_ssh_port = self.session_profiles.get_value(self.session_profiles.to_profile_id(self.args.session_profile), 'sshport') + self._runtime_error('session %s not available on X2go server [%s]:%s' % (_session_name, _server, _remote_ssh_port), exitcode=22) def __init__(self, args, logger=None, liblogger=None): """\ STILL UNDOCUMENTED + """ self.args = args if logger is None: @@ -238,12 +288,25 @@ class PyHocaCLI(x2go.X2goClient): if self.args.session_profile: + _cmdlineopt_to_sessionopt = { + 'command': 'cmd', + 'kb_layout': 'kblayout', + 'kb_type': 'kbtype', + 'sound': 'snd_system', + 'ssh_privkey': 'key_filename', + 'server': 'hostname', + 'remote_ssh_port': 'port', + } + # override session profile options by option values from the arg parser kwargs={} if hasattr(self.args, 'parser'): for a, v in self.args._get_kwargs(): if v != self.args.parser.get_default(a): - kwargs[a] = v + try: + kwargs[_cmdlineopt_to_sessionopt[a]] = v + except KeyError: + 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, @@ -359,14 +422,13 @@ class PyHocaCLI(x2go.X2goClient): elif self.args.new: self.new_session(self.x2go_session_hash) - # finally call the MainLoop of PyHocaCLI if not (self.args.new or self.args.resume or self.args.share_desktop or self.args.session_profile): sys.exit(0) - # give the session some time to come up... - # no CTRL-C is allowed during this phase... + if self.args.resume or self.args.new: + self._pyhoca_logger("give the X2go session some time to come up...", loglevel=x2go.loglevel_NOTICE, ) + i=0 - 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 @@ -381,6 +443,7 @@ class PyHocaCLI(x2go.X2goClient): self._pyhoca_logger("Press CTRL+C to end desktop sharing for this session...", loglevel=x2go.loglevel_NOTICE, ) else: self._pyhoca_logger("Press CTRL+C to suspend the running session...", loglevel=x2go.loglevel_NOTICE, ) + try: session_duration = 0 hooks/post-receive -- pyhoca-cli.git (Python X2go Client (command line client)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-cli.git" (Python X2go Client (command line client)).

1 0

python-x2go.git - master (branch) updated: 0.1.1.4-23-g45ef555
by git-admin＠x2go.org 16 Aug '11

16 Aug '11

The branch, master has been updated via 45ef555923e37f73ec2465d3825e8e5b88d1c02b (commit) from 746fb6ee2d8c028b13ca476b990e6b825dfb7b41 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 45ef555923e37f73ec2465d3825e8e5b88d1c02b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Aug 17 01:33:42 2011 +0200 Fix for X2goSession.has_terminated method. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/backends/control/_stdout.py | 2 -- x2go/session.py | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 06a5979..046e34a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ python-x2go (0.1.1.5-0~x2go1) unstable; urgency=low terminal session. - Stabilize sshfs related problems in case remote user is not in fuse group. - Do not ignore usekbd session profile option anymore, closes upstream issue #81. + - Fix for X2goSession.has_terminated method. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 19 Jul 2011 20:44:30 +0200 diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index 475ab43..5689e27 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -796,7 +796,6 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): """ session_infos = self.list_sessions() - if session_name not in session_infos.keys(): if session_name in self.terminated_terminals: return True @@ -805,7 +804,6 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): if session_name in self.associated_terminals.keys(): self.terminate(session_name) return True - return False def suspend(self, session_name): diff --git a/x2go/session.py b/x2go/session.py index aa421d8..9ac086b 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -1378,7 +1378,7 @@ class X2goSession(object): self.faulty = False if self.virgin and not self.terminated: self.terminated = None - return self.has_terminated + return self.terminated __has_terminated = has_terminated def share_local_folder(self, folder_name): hooks/post-receive -- python-x2go.git (Python X2go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2go Client API).

1 0

python-x2go.git - release/0.1.1.x (branch) updated: 0.1.1.4-21-gb6adff9
by git-admin＠x2go.org 16 Aug '11

16 Aug '11

The branch, release/0.1.1.x has been updated via b6adff9a57bdb59f184842ba222f3a3f89808aca (commit) from ff1c183ebfc1bee38502dd81f56326221b428000 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit b6adff9a57bdb59f184842ba222f3a3f89808aca Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Aug 17 01:33:42 2011 +0200 Fix for X2goSession.has_terminated method. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/backends/control/_stdout.py | 2 -- x2go/session.py | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index eb43e53..af4ca74 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ python-x2go (0.1.1.5-0~x2go1) UNRELEASED; urgency=low terminal session. - Stabilize sshfs related problems in case remote user is not in fuse group. - Do not ignore usekbd session profile option anymore, closes upstream issue #81. + - Fix for X2goSession.has_terminated method. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 19 Jul 2011 20:44:30 +0200 diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index ca4f419..2f14082 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -796,7 +796,6 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): """ session_infos = self.list_sessions() - if session_name not in session_infos.keys(): if session_name in self.terminated_terminals: return True @@ -805,7 +804,6 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): if session_name in self.associated_terminals.keys(): self.terminate(session_name) return True - return False def suspend(self, session_name): diff --git a/x2go/session.py b/x2go/session.py index 9428278..9d30221 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -1378,7 +1378,7 @@ class X2goSession(object): self.faulty = False if self.virgin and not self.terminated: self.terminated = None - return self.has_terminated + return self.terminated __has_terminated = has_terminated def share_local_folder(self, folder_name): hooks/post-receive -- python-x2go.git (Python X2go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2go Client API).

1 0

python-x2go.git - master (branch) updated: 0.1.1.4-22-g746fb6e
by git-admin＠x2go.org 16 Aug '11

16 Aug '11

The branch, master has been updated via 746fb6ee2d8c028b13ca476b990e6b825dfb7b41 (commit) from 55cd3f8f5320963600a91f598758c9e0acc7cd39 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 746fb6ee2d8c028b13ca476b990e6b825dfb7b41 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Aug 17 00:30:49 2011 +0200 cosmetic fix for share_desktop method ----------------------------------------------------------------------- Summary of changes: x2go/session.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/x2go/session.py b/x2go/session.py index e3738cf..aa421d8 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -1162,11 +1162,11 @@ class X2goSession(object): return self.running else: self.terminal_session = None - return False else: self._X2goSession__disconnect() - return False + + return False __share_desktop = share_desktop def suspend(self): hooks/post-receive -- python-x2go.git (Python X2go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2go Client API).

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits August 2011