x2go-commits June 2011

x2go-commits@lists.x2go.org

1 participants
236 discussions

pyhoca-cli.git - master (branch) updated: 0.1.3.3-8-g30b1249
by git-admin＠x2go.org 26 Jun '11

26 Jun '11

The branch, master has been updated via 30b1249f0c62590bf4007b03639543156499e903 (commit) from 9e668c575546bfa02cb6caf15ee2a32f0aaa76d0 (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 30b1249f0c62590bf4007b03639543156499e903 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Jun 26 22:58:01 2011 +0200 React to bug #627990, prefer man2html-base over man2html. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index af0b49d..3b99e99 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ pyhoca-cli (0.1.4.0-0~x2go4) UNRELEASED; urgency=low - Add X2go desktop sharing support. - Terminate shared desktop sessions of Ctrl-C (instead of suspending them. + * React to bug #627990, prefer man2html-base over man2html. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 24 Jun 2011 17:08:12 +0200 diff --git a/debian/control b/debian/control index 4b28217..0cc96cd 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Build-Depends: debhelper (>= 7.0.50~), - man2html, + man2html-base | man2html, python, python-setuptools, python-support, 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-gui.git - master (branch) updated: 0.1.0.4-3-ged2e9bd
by git-admin＠x2go.org 26 Jun '11

26 Jun '11

The branch, master has been updated via ed2e9bd9da856f86fc6d885a7d0c040c782941ee (commit) from 147054631aed6cb3e72cc88e302cfba23a3d0f9c (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 ed2e9bd9da856f86fc6d885a7d0c040c782941ee Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Jun 26 22:57:07 2011 +0200 React to bug #627990, prefer man2html-base over man2html. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index ee8a033..a7f11cf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ pyhoca-gui (0.1.0.5-0~x2go1) UNRELEASED; urgency=low - bugfix release - Fix for new color depth filter feature if the session is not registered any more. + * React to bug #627990, prefer man2html-base over man2html. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 24 Jun 2011 16:39:24 +0200 diff --git a/debian/control b/debian/control index e17abed..d2af9ba 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Build-Depends: debhelper (>= 7), - man2html, + man2html-base | man2html, python, python-setuptools, python-support, hooks/post-receive -- pyhoca-gui.git (Python X2go Client (wxPython GUI)) 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-gui.git" (Python X2go Client (wxPython GUI)).

1 0

x2goclient.git - master (branch) updated: 3.0.1.18-36-g66f6f27
by git-admin＠x2go.org 26 Jun '11

26 Jun '11

The branch, master has been updated via 66f6f27b4d0cd52642084e085476ed188a3e310e (commit) from 5928d871ab9ad2e976ab55569cbbd59c246df10e (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 66f6f27b4d0cd52642084e085476ed188a3e310e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Jun 26 22:55:37 2011 +0200 React to bug #627990, prefer man2html-base over man2html. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++- debian/control | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index d3919b6..cad2106 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ x2goclient (3.0.1.18-0~x2go3) UNRELEASED; urgency=low - * add ssh (server) as runtime dependency + * Add ssh (server) as runtime dependency + * React to bug #627990, prefer man2html-base over man2html. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 16 Jun 2011 17:13:57 +0200 diff --git a/debian/control b/debian/control index 6c73433..ec189fa 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Build-Depends: libcups2-dev, libx11-dev, doxygen, - man2html + man2html-base | man2html Standards-Version: 3.9.2 Homepage: http://code.x2go.org/releases/source/x2goclient Vcs-Git: git://code.x2go.org/x2goclient.git hooks/post-receive -- x2goclient.git (X2go 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 "x2goclient.git" (X2go Client).

1 0

pyhoca-cli.git - build-main (branch) updated: 0.1.3.3-7-g9e668c5
by git-admin＠x2go.org 24 Jun '11

24 Jun '11

The branch, build-main has been updated via 9e668c575546bfa02cb6caf15ee2a32f0aaa76d0 (commit) from 7d859c5a132df3f94245ccafad69406e1e662080 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: pyhoca/cli/__init__.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/pyhoca/cli/__init__.py b/pyhoca/cli/__init__.py index 35d9151..72337e6 100644 --- a/pyhoca/cli/__init__.py +++ b/pyhoca/cli/__init__.py @@ -20,6 +20,6 @@ """\ STILL UNDOCUMENTED """ -__VERSION__ = "0.1.3.3" +__VERSION__ = "0.1.4.0" from frontend import * 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.3.3-7-g9e668c5
by git-admin＠x2go.org 24 Jun '11

24 Jun '11

The branch, master has been updated via 9e668c575546bfa02cb6caf15ee2a32f0aaa76d0 (commit) from 7d859c5a132df3f94245ccafad69406e1e662080 (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 9e668c575546bfa02cb6caf15ee2a32f0aaa76d0 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Jun 24 17:16:35 2011 +0200 egg version increment ----------------------------------------------------------------------- Summary of changes: pyhoca/cli/__init__.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/pyhoca/cli/__init__.py b/pyhoca/cli/__init__.py index 35d9151..72337e6 100644 --- a/pyhoca/cli/__init__.py +++ b/pyhoca/cli/__init__.py @@ -20,6 +20,6 @@ """\ STILL UNDOCUMENTED """ -__VERSION__ = "0.1.3.3" +__VERSION__ = "0.1.4.0" from frontend import * 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-gui.git - build-main (branch) updated: 0.1.0.4-2-g1470546
by git-admin＠x2go.org 24 Jun '11

24 Jun '11

The branch, build-main has been updated via 147054631aed6cb3e72cc88e302cfba23a3d0f9c (commit) from 9a85fb6b8f6f602f69e27afe162e3c59b5c5e47a (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: pyhoca/wxgui/__init__.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/__init__.py b/pyhoca/wxgui/__init__.py index e95f87c..b8617d3 100644 --- a/pyhoca/wxgui/__init__.py +++ b/pyhoca/wxgui/__init__.py @@ -18,6 +18,6 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -__VERSION__ = '0.1.0.4' +__VERSION__ = '0.1.0.5' from frontend import * hooks/post-receive -- pyhoca-gui.git (Python X2go Client (wxPython GUI)) 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-gui.git" (Python X2go Client (wxPython GUI)).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.4-2-g1470546
by git-admin＠x2go.org 24 Jun '11

24 Jun '11

The branch, master has been updated via 147054631aed6cb3e72cc88e302cfba23a3d0f9c (commit) from 9a85fb6b8f6f602f69e27afe162e3c59b5c5e47a (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 147054631aed6cb3e72cc88e302cfba23a3d0f9c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Jun 24 17:15:50 2011 +0200 egg version increment ----------------------------------------------------------------------- Summary of changes: pyhoca/wxgui/__init__.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/__init__.py b/pyhoca/wxgui/__init__.py index e95f87c..b8617d3 100644 --- a/pyhoca/wxgui/__init__.py +++ b/pyhoca/wxgui/__init__.py @@ -18,6 +18,6 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -__VERSION__ = '0.1.0.4' +__VERSION__ = '0.1.0.5' from frontend import * hooks/post-receive -- pyhoca-gui.git (Python X2go Client (wxPython GUI)) 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-gui.git" (Python X2go Client (wxPython GUI)).

1 0

python-x2go.git - build-main (branch) updated: 0.1.1.1-4-g6d9eef2
by git-admin＠x2go.org 24 Jun '11

24 Jun '11

The branch, build-main has been updated via 6d9eef295e1a3386d07015e00e4292400f8c4d7f (commit) from 5d875b72fa48d6390993a5b445ae6687ac78341e (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: x2go/__init__.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/x2go/__init__.py b/x2go/__init__.py index a388e82..ae8f7f1 100644 --- a/x2go/__init__.py +++ b/x2go/__init__.py @@ -158,7 +158,7 @@ Contact """ __NAME__ = 'python-x2go' -__VERSION__ = '0.1.1.1' +__VERSION__ = '0.1.1.2' from gevent import monkey monkey.patch_all() 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.1-4-g6d9eef2
by git-admin＠x2go.org 24 Jun '11

24 Jun '11

The branch, master has been updated via 6d9eef295e1a3386d07015e00e4292400f8c4d7f (commit) from 5d875b72fa48d6390993a5b445ae6687ac78341e (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 6d9eef295e1a3386d07015e00e4292400f8c4d7f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Jun 24 17:14:58 2011 +0200 egg version increment ----------------------------------------------------------------------- Summary of changes: x2go/__init__.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/x2go/__init__.py b/x2go/__init__.py index a388e82..ae8f7f1 100644 --- a/x2go/__init__.py +++ b/x2go/__init__.py @@ -158,7 +158,7 @@ Contact """ __NAME__ = 'python-x2go' -__VERSION__ = '0.1.1.1' +__VERSION__ = '0.1.1.2' from gevent import monkey monkey.patch_all() 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 - build-main (branch) updated: 0.1.1.1-3-g5d875b7
by git-admin＠x2go.org 24 Jun '11

24 Jun '11

The branch, build-main has been updated via 5d875b72fa48d6390993a5b445ae6687ac78341e (commit) via dafc0ae55b24ce750d2e5edea6db79d394e61185 (commit) via 2c39d868a8f5fc57a66e5d2ad88e0a10c600f97d (commit) from 4f78eea77d14fad10eab3c4e604945117eaee80e (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 10 ++++++++++ x2go/client.py | 7 +++++-- x2go/registry.py | 16 ++++------------ x2go/session.py | 1 - 4 files changed, 19 insertions(+), 15 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 380637e..0805825 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +python-x2go (0.1.1.2-0~x2go1) UNRELEASED; urgency=low + + * New upstream version (0.1.1.2): + - bugfix version + - Use X2goRegistryException for session query for non-existing sessions. + - Catch this exception in X2goClient. + - Fix desktop sharing. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 24 Jun 2011 16:42:20 +0200 + python-x2go (0.1.1.1-0~x2go1) unstable; urgency=low * New bugfix version (0.1.1.1): diff --git a/x2go/client.py b/x2go/client.py index dbe19d7..c4073ca 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -984,7 +984,10 @@ class X2goClient(object): @rtype: C{str} or L{X2goSession} instance """ - return self.session_registry.get_session_of_session_name(session_name=session_name, return_object=return_object) + try: + return self.session_registry.get_session_of_session_name(session_name=session_name, return_object=return_object) + except X2goSessionExceptionRegistryException: + return None __get_session_of_session_name = get_session_of_session_name def get_session_name(self, session_uuid): @@ -1182,7 +1185,7 @@ class X2goClient(object): _desktop = desktop or "%s@%s" % (user, display) # X2goClient.list_desktops() uses caching (if enabled, so we prefer lookups here... - if _desktop not in self.list_desktops(session_uuid): + if not _desktop in self._X2goClient__list_desktops(session_uuid): raise x2go_exceptions.X2goDesktopSharingException('No such desktop ID: %s' % _desktop) return self.session_registry(session_uuid).share_desktop(desktop=desktop, user=user, display=display, share_mode=share_mode, check_desktop_list=False) diff --git a/x2go/registry.py b/x2go/registry.py index 5be0d1d..304aa97 100644 --- a/x2go/registry.py +++ b/x2go/registry.py @@ -455,8 +455,8 @@ class X2goSessionRegistry(object): self.logger('using already initially-registered yet-unused session %s' % session_uuid, loglevel=log.loglevel_NOTICE) return session_uuid - try: - session_uuid = self.get_session_of_session_name(session_name) + session_uuid = self.get_session_of_session_name(session_name) + if session_uuid is not None: _params = self.client_instance.session_profiles.to_session_params(profile_id) self(session_uuid).update_params(_params) @@ -465,10 +465,6 @@ class X2goSessionRegistry(object): self.logger('using already registered-by-session-name session %s' % session_uuid, loglevel=log.loglevel_NOTICE) return session_uuid - except X2goSessionException: - # no registered session for session_name found... FINE, go ahead! - pass - s = session.X2goSession(server=server, control_session=control_session, profile_id=profile_id, profile_name=profile_name, session_name=session_name, @@ -507,11 +503,7 @@ class X2goSessionRegistry(object): @rtype: C{bool} """ - try: - _dummy = self.get_session_of_session_name(session_name) - return True - except X2goSessionException: - return False + return bool(self.get_session_of_session_name(session_name)) def get_session_of_session_name(self, session_name, return_object=False): """\ @@ -535,7 +527,7 @@ class X2goSessionRegistry(object): elif len(found_sessions) > 1: raise X2goSessionRegistryException('there should only be one registered session of name ,,%s\'\'' % session_name) else: - raise X2goSessionException('no session of name ,,%s\'\' registered' % session_name) + return None def _sessionsWithState(self, state, return_objects=True, return_profile_names=False, return_profile_ids=False, return_session_names=False): if state == 'associated': diff --git a/x2go/session.py b/x2go/session.py index cfc8770..9439477 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -1066,7 +1066,6 @@ class X2goSession(object): logger=self.logger, **self.terminal_params) if self.has_terminal_session(): - self.terminal_session = _terminal self.session_name = self.terminal_session.session_info.name # shared desktop sessions get their startup command set by the control 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

← Newer
1
2
3
4
5
6
7
8
9
...
24
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits June 2011