x2go-commits July 2013

x2go-commits@lists.x2go.org

2 participants
625 discussions

python-x2go.git - master (branch) updated: 0.4.0.6-7-g3847b19
by git-admin＠x2go.org 31 Jul '13

31 Jul '13

The branch, master has been updated via 3847b19e083afc177aa06ac45f5421899d0032c6 (commit) from 963eaed8dba7cb7444bd18d847c630bfb53c39fe (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 3847b19e083afc177aa06ac45f5421899d0032c6 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jul 31 09:33:29 2013 +0200 Make _update_mounts in session registry cache more failsafe, this probably fixes an accumulation of server disconnects observed in recent version of Python X2Go. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +++ x2go/cache.py | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f29b9bf..3e6191f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ python-x2go (0.4.0.7-0~x2go1) UNRELEASED; urgency=low * New upstream version (0.4.0.7): - Drop duplicate method in terminal backend: is_desktop_session(). - Ignore non-registered session UUIDs in X2GoClient.clean_sessions() method. + - Make _update_mounts in session registry cache more failsafe, this probably + fixes an accumulation of server disconnects observed in recent version of + Python X2Go. * /debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. diff --git a/x2go/cache.py b/x2go/cache.py index 5998bd3..b3b6968 100644 --- a/x2go/cache.py +++ b/x2go/cache.py @@ -152,7 +152,8 @@ class X2GoListSessionsCache(object): self.x2go_listsessions_cache[profile_name]['mounts'] = {} if self.x2go_listsessions_cache[profile_name]['sessions']: for session_name in self.x2go_listsessions_cache[profile_name]['sessions']: - if self.client_instance.get_session_of_session_name(session_name, return_object=True, match_profile_name=profile_name).is_running(): + session = self.client_instance.get_session_of_session_name(session_name, return_object=True, match_profile_name=profile_name) + if session is not None and session.is_running(): if control_session is not None and not control_session.has_session_died(): self.x2go_listsessions_cache[profile_name]['mounts'].update(control_session.list_mounts(session_name)) except (x2go_exceptions.X2GoControlSessionException, AttributeError), e: 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.4.0.6-6-g963eaed
by git-admin＠x2go.org 31 Jul '13

31 Jul '13

The branch, master has been updated via 963eaed8dba7cb7444bd18d847c630bfb53c39fe (commit) from 7d7ec5f25b879a38a6fa638242c84f2764698dc8 (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 963eaed8dba7cb7444bd18d847c630bfb53c39fe Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jul 31 09:31:40 2013 +0200 Ignore non-registered session UUIDs in X2GoClient.clean_sessions() method. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- x2go/client.py | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 98bdaf7..f29b9bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,10 +2,10 @@ python-x2go (0.4.0.7-0~x2go1) UNRELEASED; urgency=low * New upstream version (0.4.0.7): - Drop duplicate method in terminal backend: is_desktop_session(). + - Ignore non-registered session UUIDs in X2GoClient.clean_sessions() method. * /debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 28 Jul 2013 19:48:57 +0200 python-x2go (0.4.0.6-0~x2go1) unstable; urgency=low diff --git a/x2go/client.py b/x2go/client.py index d554635..a3ff64d 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -2558,8 +2558,12 @@ class X2GoClient(object): """ _destroy_terminals = not ( self.auto_update_sessionregistry == True) - session = self.session_registry(session_uuid) - session.clean_sessions(destroy_terminals=_destroy_terminals, published_applications=published_applications) + try: + session = self.session_registry(session_uuid) + session.clean_sessions(destroy_terminals=_destroy_terminals, published_applications=published_applications) + except x2go_exceptions.X2GoSessionRegistryException: + # silently ignore a non-registered session UUID (mostly occurs during disconnects) + pass __clean_sessions = clean_sessions def list_sessions(self, session_uuid=None, 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

x2goserver.git - master (branch) updated: 3.1.1.3-207-g6d42e9c
by git-admin＠x2go.org 31 Jul '13

31 Jul '13

The branch, master has been updated via 6d42e9c609f475e7fd41a20d134147d581fcb0b4 (commit) from 915476c5721a4bc8971a8ee4e0091373374d14dc (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 6d42e9c609f475e7fd41a20d134147d581fcb0b4 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jul 31 08:55:31 2013 +0200 wrap too-long changelog line ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 9e2ae03..6d20e9f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -43,7 +43,8 @@ x2goserver (4.1.0.0-0~x2go1) UNRELEASED; urgency=low * New upstream version (4.1.0.0): + Add markdown files for most of the X2Go Server project folders. (Fixes: #102). - * Fix "server" command line option for x2golistsessions call in x2golistdesktops + - Fix "server" command line option for x2golistsessions call in + x2golistdesktops. [ Orion Poplawski ] * New upstream version (4.1.0.0): hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - release/4.0.1.x (branch) updated: 4.0.1.6-4-g6567318
by git-admin＠x2go.org 31 Jul '13

31 Jul '13

The branch, release/4.0.1.x has been updated via 6567318201544d31d380a7fabb90de87bfbdb89a (commit) from 7d0d4ff8085faca966eacf5b013200e1bf016887 (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 6567318201544d31d380a7fabb90de87bfbdb89a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jul 31 09:06:01 2013 +0200 Fine-tune x2goserver-xsession/Makefile: if /etc/X11 has Xsession.d and/or Xsession.options they get symlinked into /etc/x2go. Otherwise Xsession.d and Xsession.options are created under /etc/x2go as empty dir/file. (Fixes: #278). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 +++++ x2goserver-xsession/Makefile | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index ce613a0..d6b0af6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,11 @@ x2goserver (4.0.1.7-0~x2go1) UNRELEASED; urgency=low (Fixes: #278). [ Mike Gabriel ] + * New upstream version (4.0.1.7): + - Fine-tune x2goserver-xsession/Makefile: if /etc/X11 has Xsession.d and/or + Xsession.options they get symlinked into /etc/x2go. Otherwise Xsession.d + and Xsession.options are created under /etc/x2go as empty dir/file. + (Fixes: #278). * /debian/control: - Update LONG_DESCRIPTIONS. diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile index ee23fb0..7118d85 100755 --- a/x2goserver-xsession/Makefile +++ b/x2goserver-xsession/Makefile @@ -21,6 +21,7 @@ MANDIR=$(PREFIX)/share/man SHAREDIR=$(PREFIX)/share/x2go XSESSIONDIR ?= /etc/X11/Xsession.d +XSESSIONOPTIONFILE ?= /etc/X11/Xsession.options #BIN_SCRIPTS=$(shell cd bin && echo *) #SBIN_SCRIPTS=$(shell cd sbin && echo *) @@ -68,8 +69,8 @@ install_config: # provide target dirs for X11 related symlinks $(INSTALL_PROGRAM) etc/Xsession $(DESTDIR)$(ETCDIR)/ $(INSTALL_SYMLINK) /etc/X11/Xresources $(DESTDIR)$(ETCDIR)/ - $(INSTALL_SYMLINK) $(XSESSIONDIR) $(DESTDIR)$(ETCDIR)/Xsession.d - + if [ -e $(XSESSIONOPTIONFILE) ]; then $(INSTALL_SYMLINK) $(XSESSIONOPTIONFILE) $(DESTDIR)$(ETCDIR)/Xsession.options; else touch $(DESTDIR)$(ETCDIR)/Xsession.options; fi + if [ -d $(XSESSIONDIR) ]; then $(INSTALL_SYMLINK) $(XSESSIONDIR) $(DESTDIR)$(ETCDIR)/Xsession.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/Xsession.d; fi install_man: # $(INSTALL_DIR) $(DESTDIR)$(MANDIR) hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-208-g9157f22
by git-admin＠x2go.org 31 Jul '13

31 Jul '13

The branch, master has been updated via 9157f221a1f0758f4489baf63f710b5fbfd5b59f (commit) from 6d42e9c609f475e7fd41a20d134147d581fcb0b4 (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 9157f221a1f0758f4489baf63f710b5fbfd5b59f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jul 31 09:06:01 2013 +0200 Fine-tune x2goserver-xsession/Makefile: if /etc/X11 has Xsession.d and/or Xsession.options they get symlinked into /etc/x2go. Otherwise Xsession.d and Xsession.options are created under /etc/x2go as empty dir/file. (Fixes: #278). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 +++++ x2goserver-xsession/Makefile | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 6d20e9f..bfac45a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -61,6 +61,11 @@ x2goserver (4.0.1.7-0~x2go1) UNRELEASED; urgency=low (Fixes: #278). [ Mike Gabriel ] + * New upstream version (4.0.1.7): + - Fine-tune x2goserver-xsession/Makefile: if /etc/X11 has Xsession.d and/or + Xsession.options they get symlinked into /etc/x2go. Otherwise Xsession.d + and Xsession.options are created under /etc/x2go as empty dir/file. + (Fixes: #278). * /debian/control: - Update LONG_DESCRIPTIONS. diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile index c83d36d..134cd81 100755 --- a/x2goserver-xsession/Makefile +++ b/x2goserver-xsession/Makefile @@ -21,6 +21,7 @@ MANDIR=$(PREFIX)/share/man SHAREDIR=$(PREFIX)/share/x2go XSESSIONDIR ?= /etc/X11/Xsession.d +XSESSIONOPTIONFILE ?= /etc/X11/Xsession.options #BIN_SCRIPTS=$(shell cd bin && echo *) #SBIN_SCRIPTS=$(shell cd sbin && echo *) @@ -60,8 +61,8 @@ install_config: # provide target dirs for X11 related symlinks $(INSTALL_PROGRAM) etc/Xsession $(DESTDIR)$(ETCDIR)/ $(INSTALL_SYMLINK) /etc/X11/Xresources $(DESTDIR)$(ETCDIR)/ - $(INSTALL_SYMLINK) $(XSESSIONDIR) $(DESTDIR)$(ETCDIR)/Xsession.d - + if [ -e $(XSESSIONOPTIONFILE) ]; then $(INSTALL_SYMLINK) $(XSESSIONOPTIONFILE) $(DESTDIR)$(ETCDIR)/Xsession.options; else touch $(DESTDIR)$(ETCDIR)/Xsession.options; fi + if [ -d $(XSESSIONDIR) ]; then $(INSTALL_SYMLINK) $(XSESSIONDIR) $(DESTDIR)$(ETCDIR)/Xsession.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/Xsession.d; fi install_man: hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-206-g915476c
by git-admin＠x2go.org 31 Jul '13

31 Jul '13

The branch, master has been updated via 915476c5721a4bc8971a8ee4e0091373374d14dc (commit) from 6a1a5cce5c2b14956d36da9e72dd476e0e064f4a (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 915476c5721a4bc8971a8ee4e0091373374d14dc Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jul 30 22:30:04 2013 +0200 lower case in English text ----------------------------------------------------------------------- Summary of changes: debian/control | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) The diff of changes is: diff --git a/debian/control b/debian/control index ab2b9af..e5504b2 100644 --- a/debian/control +++ b/debian/control @@ -59,7 +59,7 @@ Description: X2Go server daemon scripts X2Go is a server based computing environment with - session resuming - low bandwidth support - - Session Brokerage Support + - session brokerage support - client side mass storage mounting support - audio support - authentication by smartcard and USB stick @@ -89,7 +89,7 @@ Description: X2Go Server (common files) X2Go is a server based computing environment with - session resuming - low bandwidth support - - Session Brokerage Support + - session brokerage support - client side mass storage mounting support - audio support - authentication by smartcard and USB stick @@ -111,7 +111,7 @@ Description: Perl X2Go::Server package X2Go is a server based computing environment with - session resuming - low bandwidth support - - Session Brokerage Support + - session brokerage support - client side mass storage mounting support - audio support - authentication by smartcard and USB stick @@ -139,7 +139,7 @@ Description: Perl X2Go::Server:DB package X2Go is a server based computing environment with - session resuming - low bandwidth support - - Session Brokerage Support + - session brokerage support - client side mass storage mounting support - audio support - authentication by smartcard and USB stick @@ -157,7 +157,7 @@ Description: Perl X2Go::Log package X2Go is a server based computing environment with - session resuming - low bandwidth support - - Session Brokerage Support + - session brokerage support - client side mass storage mounting support - audio support - authentication by smartcard and USB stick @@ -180,7 +180,7 @@ Description: X2Go server daemon scripts (printing) X2Go is a server based computing environment with - session resuming - low bandwidth support - - Session Brokerage Support + - session brokerage support - client side mass storage mounting support - audio support - authentication by smartcard and USB stick @@ -207,7 +207,7 @@ Description: X2Go server daemon scripts (backwards compatitbity to old client ve X2Go is a server based computing environment with - session resuming - low bandwidth support - - Session Brokerage Support + - session brokerage support - client side mass storage mounting support - audio support - authentication by smartcard and USB stick @@ -225,7 +225,7 @@ Description: X2Go server daemon scripts (extensions) X2Go is a server based computing environment with - session resuming - low bandwidth support - - Session Brokerage Support + - session brokerage support - client side mass storage mounting support - audio support - authentication by smartcard and USB stick @@ -248,7 +248,7 @@ Description: X2Go server daemon scripts (Xsession runner) X2Go is a server based computing environment with - session resuming - low bandwidth support - - Session Brokerage Support + - session brokerage support - client side mass storage mounting support - audio support - authentication by smartcard and USB stick @@ -272,7 +272,7 @@ Description: Generic (freedesktop-based) file manager bindings for X2Go X2Go is a server based computing environment with - session resuming - low bandwidth support - - Session Brokerage Support + - session brokerage support - client side mass storage mounting support - audio support - authentication by smartcard and USB stick @@ -297,7 +297,7 @@ Description: X2Go server daemon scripts (add-ons for pyhoca client) X2Go is a server based computing environment with - session resuming - low bandwidth support - - Session Brokerage Support + - session brokerage support - client side mass storage mounting support - audio support - authentication by smartcard and USB stick hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).

1 0

python-x2go.git - master (branch) updated: 0.4.0.6-4-g7f3bb41
by git-admin＠x2go.org 30 Jul '13

30 Jul '13

The branch, master has been updated via 7f3bb41f604c678dd6798636307f0ceeb7297fff (commit) from 6d253091c228b3aa3f5bb6f356d5c72e6f2009a1 (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 7f3bb41f604c678dd6798636307f0ceeb7297fff Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jul 30 22:54:02 2013 +0200 Revert "Drop duplicate method in terminal backend: is_desktop_session()." This reverts commit 6d253091c228b3aa3f5bb6f356d5c72e6f2009a1. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 7 ++----- x2go/backends/terminal/_stdout.py | 11 +++++++++++ x2go/cache.py | 6 +++--- 3 files changed, 16 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 98bdaf7..1884948 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,7 @@ -python-x2go (0.4.0.7-0~x2go1) UNRELEASED; urgency=low +python-x2go (0.4.0.7-0~x2go2) UNRELEASED; urgency=low - * New upstream version (0.4.0.7): - - Drop duplicate method in terminal backend: is_desktop_session(). * /debian/control: - + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. - + - Replace LDAP support with session brokerage support in LONG_DESCRIPTION. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 28 Jul 2013 19:48:57 +0200 diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index 4f28311..b1a3f28 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -1637,6 +1637,17 @@ class X2GoTerminalSessionSTDOUT(object): self._cleaned_up = True + def is_desktop_session(self): + """\ + Test if this terminal session is a desktop session. + + @return: C{True} if this session is of session type desktop ('D'). + @rtype: C{bool} + + """ + self.params.rewrite_session_type() + return self.params.session_type == 'D' + def is_rootless_session(self): """\ Test if this terminal session is a rootless session. diff --git a/x2go/cache.py b/x2go/cache.py index 9fad89d..5998bd3 100644 --- a/x2go/cache.py +++ b/x2go/cache.py @@ -152,9 +152,9 @@ class X2GoListSessionsCache(object): self.x2go_listsessions_cache[profile_name]['mounts'] = {} if self.x2go_listsessions_cache[profile_name]['sessions']: for session_name in self.x2go_listsessions_cache[profile_name]['sessions']: - #if self.client_instance.get_session_of_session_name(session_name, return_object=True, match_profile_name=profile_name).is_running(): - if control_session is not None and not control_session.has_session_died(): - self.x2go_listsessions_cache[profile_name]['mounts'].update(control_session.list_mounts(session_name)) + if self.client_instance.get_session_of_session_name(session_name, return_object=True, match_profile_name=profile_name).is_running(): + if control_session is not None and not control_session.has_session_died(): + self.x2go_listsessions_cache[profile_name]['mounts'].update(control_session.list_mounts(session_name)) except (x2go_exceptions.X2GoControlSessionException, AttributeError), e: if profile_name in self.x2go_listsessions_cache.keys(): del self.x2go_listsessions_cache[profile_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.4.0.6-5-g7d7ec5f
by git-admin＠x2go.org 30 Jul '13

30 Jul '13

The branch, master has been updated via 7d7ec5f25b879a38a6fa638242c84f2764698dc8 (commit) from 7f3bb41f604c678dd6798636307f0ceeb7297fff (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 7d7ec5f25b879a38a6fa638242c84f2764698dc8 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jul 30 22:54:50 2013 +0200 Drop duplicate method in terminal backend: is_desktop_session(). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 7 +++++-- x2go/backends/terminal/_stdout.py | 11 ----------- 2 files changed, 5 insertions(+), 13 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 1884948..98bdaf7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,10 @@ -python-x2go (0.4.0.7-0~x2go2) UNRELEASED; urgency=low +python-x2go (0.4.0.7-0~x2go1) UNRELEASED; urgency=low + * New upstream version (0.4.0.7): + - Drop duplicate method in terminal backend: is_desktop_session(). * /debian/control: - - Replace LDAP support with session brokerage support in LONG_DESCRIPTION. + + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 28 Jul 2013 19:48:57 +0200 diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index b1a3f28..4f28311 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -1637,17 +1637,6 @@ class X2GoTerminalSessionSTDOUT(object): self._cleaned_up = True - def is_desktop_session(self): - """\ - Test if this terminal session is a desktop session. - - @return: C{True} if this session is of session type desktop ('D'). - @rtype: C{bool} - - """ - self.params.rewrite_session_type() - return self.params.session_type == 'D' - def is_rootless_session(self): """\ Test if this terminal session is a rootless session. 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.4.0.6-3-g6d25309
by git-admin＠x2go.org 30 Jul '13

30 Jul '13

The branch, master has been updated via 6d253091c228b3aa3f5bb6f356d5c72e6f2009a1 (commit) from 1a3160a08878057d7bff94d0ac7104eed27d4804 (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 6d253091c228b3aa3f5bb6f356d5c72e6f2009a1 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jul 30 22:53:26 2013 +0200 Drop duplicate method in terminal backend: is_desktop_session(). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 7 +++++-- x2go/backends/terminal/_stdout.py | 11 ----------- x2go/cache.py | 6 +++--- 3 files changed, 8 insertions(+), 16 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 1884948..98bdaf7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,10 @@ -python-x2go (0.4.0.7-0~x2go2) UNRELEASED; urgency=low +python-x2go (0.4.0.7-0~x2go1) UNRELEASED; urgency=low + * New upstream version (0.4.0.7): + - Drop duplicate method in terminal backend: is_desktop_session(). * /debian/control: - - Replace LDAP support with session brokerage support in LONG_DESCRIPTION. + + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 28 Jul 2013 19:48:57 +0200 diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index b1a3f28..4f28311 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -1637,17 +1637,6 @@ class X2GoTerminalSessionSTDOUT(object): self._cleaned_up = True - def is_desktop_session(self): - """\ - Test if this terminal session is a desktop session. - - @return: C{True} if this session is of session type desktop ('D'). - @rtype: C{bool} - - """ - self.params.rewrite_session_type() - return self.params.session_type == 'D' - def is_rootless_session(self): """\ Test if this terminal session is a rootless session. diff --git a/x2go/cache.py b/x2go/cache.py index 5998bd3..9fad89d 100644 --- a/x2go/cache.py +++ b/x2go/cache.py @@ -152,9 +152,9 @@ class X2GoListSessionsCache(object): self.x2go_listsessions_cache[profile_name]['mounts'] = {} if self.x2go_listsessions_cache[profile_name]['sessions']: for session_name in self.x2go_listsessions_cache[profile_name]['sessions']: - if self.client_instance.get_session_of_session_name(session_name, return_object=True, match_profile_name=profile_name).is_running(): - if control_session is not None and not control_session.has_session_died(): - self.x2go_listsessions_cache[profile_name]['mounts'].update(control_session.list_mounts(session_name)) + #if self.client_instance.get_session_of_session_name(session_name, return_object=True, match_profile_name=profile_name).is_running(): + if control_session is not None and not control_session.has_session_died(): + self.x2go_listsessions_cache[profile_name]['mounts'].update(control_session.list_mounts(session_name)) except (x2go_exceptions.X2GoControlSessionException, AttributeError), e: if profile_name in self.x2go_listsessions_cache.keys(): del self.x2go_listsessions_cache[profile_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.4.0.6-2-g1a3160a
by git-admin＠x2go.org 30 Jul '13

30 Jul '13

The branch, master has been updated via 1a3160a08878057d7bff94d0ac7104eed27d4804 (commit) from b141dfb94dfd29293df9ad5e95ae0cc53f878391 (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 1a3160a08878057d7bff94d0ac7104eed27d4804 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jul 30 22:44:26 2013 +0200 debian/control: Replace LDAP support with session brokerage support in LONG_DESCRIPTION. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++- debian/control | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 08d000b..1884948 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ python-x2go (0.4.0.7-0~x2go2) UNRELEASED; urgency=low - * Continue development... + * /debian/control: + - Replace LDAP support with session brokerage support in LONG_DESCRIPTION. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 28 Jul 2013 19:48:57 +0200 diff --git a/debian/control b/debian/control index 9c85958..ad1071b 100644 --- a/debian/control +++ b/debian/control @@ -37,7 +37,7 @@ Description: Python module providing X2Go client API X2Go is a server based computing environment with - session resuming - low bandwidth support - - LDAP support + - session brokerage support - client side mass storage mounting support - audio support - authentication by smartcard and USB stick @@ -55,7 +55,7 @@ Description: Python module providing X2Go client API (documentation) X2Go is a server based computing environment with - session resuming - low bandwidth support - - LDAP support + - session brokerage support - client side mass storage mounting support - audio support - authentication by smartcard and USB stick 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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits July 2013