x2go-commits April 2012

x2go-commits@lists.x2go.org

1 participants
194 discussions

python-x2go.git - master (branch) updated: 0.1.1.4-231-g203f5fe
by git-admin＠x2go.org 29 Apr '12

29 Apr '12

The branch, master has been updated via 203f5fe9543710232e8cfb894a25910d709afc09 (commit) from fccfb5cdbc81a0bbea0c1ffeba57448bbd257d49 (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 203f5fe9543710232e8cfb894a25910d709afc09 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]> Date: Sun Apr 29 16:23:05 2012 +0200 Adapt python-x2go to launching Unity-2d on Ubuntu precise. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/backends/terminal/_stdout.py | 2 ++ x2go/defaults.py | 2 +- 3 files changed, 4 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 2365db9..400e537 100644 --- a/debian/changelog +++ b/debian/changelog @@ -120,6 +120,7 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low transformed to OS-specific path names. - Not using gevent to spawn MIME box default applications. - Protect session cache from deletion while being processed. + - Adapt python-x2go to launching Unity-2d on Ubuntu precise. * Depend on python-xlib. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 28 Sep 2012 01:44:21 +0100 diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index 720e0e1..5ed8d83 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -931,6 +931,8 @@ class X2goTerminalSessionSTDOUT(object): if cmd in _X2GO_GENERIC_APPLICATIONS: return True + if cmd in _X2GO_DESKTOPSESSIONS.keys(): + return True elif 'XSHAD' in cmd: return True elif 'PUBLISHED' in cmd and 'X2GO_PUBLISHED_APPLICATIONS' in self.control_session.get_server_features(): diff --git a/x2go/defaults.py b/x2go/defaults.py index f9b8bf6..8a12e23 100644 --- a/x2go/defaults.py +++ b/x2go/defaults.py @@ -375,7 +375,7 @@ X2GO_DESKTOPSESSIONS={ 'XFCE4': 'xfce4-session', 'LXDE': 'startlxde', 'TRINITY': 'starttrinity', - 'UNITY': 'unity-2d-launcher', + 'UNITY': 'unity', } """A dictionary with meta-commands for X2go's window manager sessions.""" 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). [View Less]

1 0

x2goserver.git - master (branch) updated: 3.1.1.0-11-g22d7413
by git-admin＠x2go.org 29 Apr '12

29 Apr '12

The branch, master has been updated via 22d7413c1ee6133326095ed344e0c47a391c4deb (commit) from 36cae2ee8140e7afc3103ceb6e22e17af97f465b (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 22d7413c1ee6133326095ed344e0c47a391c4deb Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]

1 0

x2goserver.git - master (branch) updated: 3.1.1.0-10-g36cae2e
by git-admin＠x2go.org 29 Apr '12

29 Apr '12

The branch, master has been updated via 36cae2ee8140e7afc3103ceb6e22e17af97f465b (commit) from 3b0fc54b49b2e3dc5617e4fc2ce7ddaa0c29faa4 (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 36cae2ee8140e7afc3103ceb6e22e17af97f465b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]

1 0

python-x2go.git - master (branch) updated: 0.1.1.4-230-gfccfb5c
by git-admin＠x2go.org 29 Apr '12

29 Apr '12

The branch, master has been updated via fccfb5cdbc81a0bbea0c1ffeba57448bbd257d49 (commit) from 301f531414426b31db6b2196502f7c1310bb7eb4 (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 fccfb5cdbc81a0bbea0c1ffeba57448bbd257d49 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]> Date: Sun Apr 29 15:13:43 2012 +0200 handle import and usage of defautls.X2GO_DESKTOPSESSIONS differently ----------------------------------------------------------------------- Summary of changes: x2go/backends/terminal/_stdout.py | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index 3ef850f..720e0e1 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -51,6 +51,7 @@ from x2go.defaults import CURRENT_LOCAL_USER as _CURRENT_LOCAL_USER from x2go.defaults import X2GO_CLIENT_ROOTDIR as _X2GO_CLIENT_ROOTDIR from x2go.defaults import X2GO_SESSIONS_ROOTDIR as _X2GO_SESSIONS_ROOTDIR from x2go.defaults import X2GO_GENERIC_APPLICATIONS as _X2GO_GENERIC_APPLICATIONS +from x2go.defaults import X2GO_DESKTOPSESSIONS as _X2GO_DESKTOPSESSIONS from x2go.backends.info import X2goServerSessionInfo as _X2goServerSessionInfo from x2go.backends.info import X2goServerSessionList as _X2goServerSessionList @@ -65,8 +66,8 @@ def _rewrite_cmd(cmd, params=None): cmd = cmd or '' # find window manager commands - if cmd in defaults.X2GO_DESKTOPSESSIONS.keys(): - cmd = defaults.X2GO_DESKTOPSESSIONS[cmd] + if cmd in _X2GO_DESKTOPSESSIONS.keys(): + cmd = _X2GO_DESKTOPSESSIONS[cmd] if (cmd == 'RDP') and (type(params) == X2goSessionParams): if params.geometry == 'fullscreen': @@ -83,7 +84,6 @@ def _rewrite_cmd(cmd, params=None): return cmd - def _rewrite_blanks(cmd): # X2Go run command replace X2GO_SPACE_CHAR string with blanks if cmd: @@ -124,9 +124,9 @@ class X2goSessionParams(object): self.session_type = 'R' elif cmd == 'XDMCP': self.session_type = 'D' - elif cmd in defaults.X2GO_DESKTOPSESSIONS.keys(): + elif cmd in _X2GO_DESKTOPSESSIONS.keys(): self.session_type = 'D' - elif os.path.basename(cmd) in defaults.X2GO_DESKTOPSESSIONS.values(): + elif os.path.basename(cmd) in _X2GO_DESKTOPSESSIONS.values(): self.session_type = 'D' elif self.session_type not in ("S", "shared", "shadow"): self.session_type = 'R' 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). [View Less]

1 0

x2goserver.git - master (branch) updated: 3.1.1.0-9-g3b0fc54
by git-admin＠x2go.org 29 Apr '12

29 Apr '12

The branch, master has been updated via 3b0fc54b49b2e3dc5617e4fc2ce7ddaa0c29faa4 (commit) from 077700a44d18794fce590395fbc4b84eb818f1f4 (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 3b0fc54b49b2e3dc5617e4fc2ce7ddaa0c29faa4 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]> Date: Sun Apr 29 14:40:44 2012 +0200 Additionally to X2GO_SERVERSIDE_DESKTOPCOMMANDS allow rewriting of the commands ,,gnome-session'' and ,,unity-2d-launcher'' in x2goruncommand. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2goserver/bin/x2goruncommand | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 37d81d0..c1a6c95 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ x2goserver (3.1.1.1-0~x2go1) UNRELEASED; urgency=low - Add feature X2GO_SERVERSIDE_DESKTOPCOMMANDS. Let client provide a generic desktop shell command (GNOME, UNITRY, KDE, etc.) which then gets translated into an executable command by x2goruncommand. + - Additionally to X2GO_SERVERSIDE_DESKTOPCOMMANDS allow rewriting of the + commands ,,gnome-session'' and ,,unity-2d-launcher'' in x2goruncommand. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 04 Apr 2012 11:44:14 +0200 diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 6518685..310424a 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -69,7 +69,7 @@ if [ -e "/etc/lsb-release" ]; then fi # let x2goruncommand choose what command to use for a given desktop shell name (GNOME, UNITY, KDE, XFCE4, LXDE, TRINITY) -if [ "$cmd" == "GNOME" ]; then +if [ "$cmd" == "GNOME" ] || [ "$cmd" == "gnome-session" ]; then # Ubuntu starting with 12.04 (precise) launches Unity when calling gnome-session. # GNOME (Ubuntu classic) gets launched when calling gnome-session-fallback. @@ -79,7 +79,7 @@ if [ "$cmd" == "GNOME" ]; then else $cmd="/usr/bin/gnome-session" fi -elif [ "$cmd" == "UNITY" ] && [ "$DISTRIB_ID" == "Ubuntu" ] && echo "$DISTRIB_CODENAME" | egrep -v "^[a-o].*" >/dev/null; then +elif ([ "$cmd" == "UNITY" ] || [ "$cmd" == "unity-2d-launcher" ]) && [ "$DISTRIB_ID" == "Ubuntu" ] && echo "$DISTRIB_CODENAME" | egrep -v "^[a-o].*" >/dev/null; then $cmd="/usr/bin/gnome-session" elif [ "$cmd" == "KDE" ]; then 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). [View Less]

1 0

x2goserver.git - master (branch) updated: 3.1.1.0-8-g077700a
by git-admin＠x2go.org 29 Apr '12

29 Apr '12

The branch, master has been updated via 077700a44d18794fce590395fbc4b84eb818f1f4 (commit) from c13ffe1cb2c39edfacab52bc62e278469da19c9e (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 077700a44d18794fce590395fbc4b84eb818f1f4 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]> Date: Sun Apr 29 14:20:42 2012 +0200 Add feature X2GO_SERVERSIDE_DESKTOPCOMMANDS. Let client provide a generic desktop shell command (GNOME, UNITRY, KDE, etc.) which then gets translated into an executable command by x2goruncommand. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++ x2goserver/bin/x2goruncommand | 29 ++++++++++++++++++++ x2goserver/share/x2gofeature.d/x2goserver.features | 1 + 3 files changed, 33 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index bca28f0..37d81d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ x2goserver (3.1.1.1-0~x2go1) UNRELEASED; urgency=low - Avoid error messages in x2gocmdexistmessage if cmdoutput file could not be found. - Provide nx-X11 libraries for applications launched via x2goruncommand. + - Add feature X2GO_SERVERSIDE_DESKTOPCOMMANDS. Let client provide a generic + desktop shell command (GNOME, UNITRY, KDE, etc.) which then gets + translated into an executable command by x2goruncommand. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 04 Apr 2012 11:44:14 +0200 diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index a6addbf..6518685 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -63,6 +63,35 @@ elif [ "$sndsys" == "arts" ]; then export ARTS_SERVER=localhost:$4 fi +# detect Ubuntu version via /etc/lsb-release (not supported by Debian) +if [ -e "/etc/lsb-release" ]; then + source /etc/lsb-release +fi + +# let x2goruncommand choose what command to use for a given desktop shell name (GNOME, UNITY, KDE, XFCE4, LXDE, TRINITY) +if [ "$cmd" == "GNOME" ]; then + + # Ubuntu starting with 12.04 (precise) launches Unity when calling gnome-session. + # GNOME (Ubuntu classic) gets launched when calling gnome-session-fallback. + + if [ "$DISTRIB_ID" == "Ubuntu" ] && echo "$DISTRIB_CODENAME" | egrep -v "^[a-o].*" >/dev/null; then + $cmd="/usr/bin/gnome-session-fallback" + else + $cmd="/usr/bin/gnome-session" + fi +elif [ "$cmd" == "UNITY" ] && [ "$DISTRIB_ID" == "Ubuntu" ] && echo "$DISTRIB_CODENAME" | egrep -v "^[a-o].*" >/dev/null; then + $cmd="/usr/bin/gnome-session" + +elif [ "$cmd" == "KDE" ]; then + $cmd="/usr/bin/startkde" +elif [ "$cmd" == "XFCE4" ]; then + $cmd="/usr/bin/xfce4-session" +elif [ "$cmd" == "LXDE" ]; then + $cmd="/usr/bin/startlxde" +elif [ "$cmd" == "TRINITY" ]; then + $cmd="/usr/bin/starttrinity" +fi + if [ "$cmd" == "WWWBROWSER" ]; then if [ -e "/usr/bin/firefox" ]; then cmd="/usr/bin/firefox" diff --git a/x2goserver/share/x2gofeature.d/x2goserver.features b/x2goserver/share/x2gofeature.d/x2goserver.features index 70313d2..a5dd741 100755 --- a/x2goserver/share/x2gofeature.d/x2goserver.features +++ b/x2goserver/share/x2gofeature.d/x2goserver.features @@ -34,6 +34,7 @@ case "$X2GO_FEATURE" in "X2GO_UMOUNTSESSION_ALL") echo "ok"; exit 0;; "X2GO_UMOUNTSESSION_ONLYPATH") echo "ok"; exit 0;; "X2GO_PUBLISHED_APPLICATIONS") echo "ok"; exit 0;; + "X2GO_SERVERSIDE_DESKTOPCOMMANDS") echo "ok"; exit 0;; *) exit -1;; esac 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). [View Less]

1 0

x2goserver.git - master (branch) updated: 3.1.1.0-7-gc13ffe1
by git-admin＠x2go.org 28 Apr '12

28 Apr '12

The branch, master has been updated via c13ffe1cb2c39edfacab52bc62e278469da19c9e (commit) from 91c4bb8568bb649fcef89484b19a556453b57e04 (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 c13ffe1cb2c39edfacab52bc62e278469da19c9e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]> Date: Sat Apr 28 23:46:35 2012 +0200 Provide nx-X11 libraries for applications launched via x2goruncommand. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2goserver/bin/x2goruncommand | 5 ++++- 2 files changed, 5 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 82df7fc..bca28f0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ x2goserver (3.1.1.1-0~x2go1) UNRELEASED; urgency=low client-side. - Avoid error messages in x2gocmdexistmessage if cmdoutput file could not be found. + - Provide nx-X11 libraries for applications launched via x2goruncommand. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 04 Apr 2012 11:44:14 +0200 diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 2f70633..a6addbf 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -52,7 +52,9 @@ export QT_GRAPHICSSYSTEM=native IMEXIT="false" NX_XINERAMA_LIBS=/usr/lib/nx/X11/Xinerama -test -n "$LD_LIBRARY_PATH" && LD_LIBRARY_PATH=$NX_XINERAMA_LIBS:$LD_LIBRARY_PATH || LD_LIBRARY_PATH="$NX_XINERAMA_LIBS" +NX_LIBS=/usr/lib/nx/X11 +test -n "$LD_LIBRARY_PATH" && LD_LIBRARY_PATH=$NX_XINERAMA_LIBS:$NX_LIBS:$LD_LIBRARY_PATH || LD_LIBRARY_PATH="$NX_XINERAMA_LIBS:$NX_LIBS" +$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "exporting LD_LIBRARY_PATH=$LD_LIBRARY_PATH" export LD_LIBRARY_PATH if [ "$sndsys" == "esd" ]; then @@ -141,6 +143,7 @@ if [ "$EXEC" != "" ] && [ -x $EXEC ]; then $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "launching session with Xsession-x2go mechanism, using STARTUP=\"$STARTUP\"" STARTUP="$STARTUP" /etc/x2go/Xsession } || { + $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "executing command $EXEC..." $cmd } 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). [View Less]

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.10-235-gd3be56f
by git-admin＠x2go.org 28 Apr '12

28 Apr '12

The branch, master has been updated via d3be56fe6794a891488320343db3cd34b8236b7e (commit) from 93e268e71d8e8903f711ad46f10da4d94c5cfa07 (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 d3be56fe6794a891488320343db3cd34b8236b7e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]

1 0

python-x2go.git - master (branch) updated: 0.1.1.4-229-g301f531
by git-admin＠x2go.org 24 Apr '12

24 Apr '12

The branch, master has been updated via 301f531414426b31db6b2196502f7c1310bb7eb4 (commit) from fe53e1d162fc80671321f9904ecc47f2f59b8071 (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 301f531414426b31db6b2196502f7c1310bb7eb4 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]> Date: Tue Apr 24 21:32:02 2012 +0200 Protect session cache from deletion while being processed. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/cache.py | 6 ++++++ 2 files changed, 7 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f927ece..2365db9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -119,6 +119,7 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Make sure path names in X2goPrintActions and X2goMIMEboxActions get transformed to OS-specific path names. - Not using gevent to spawn MIME box default applications. + - Protect session cache from deletion while being processed. * Depend on python-xlib. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 28 Sep 2012 01:44:21 +0100 diff --git a/x2go/cache.py b/x2go/cache.py index 77cbff2..a67b347 100644 --- a/x2go/cache.py +++ b/x2go/cache.py @@ -25,6 +25,7 @@ __NAME__ = 'x2gocache-pylib' # modules import copy +import gevent # Python X2Go modules import log @@ -62,6 +63,7 @@ class X2goListSessionsCache(object): """ self.x2go_listsessions_cache = {} self.last_listsessions_cache = {} + self.protected = False if logger is None: self.logger = log.X2goLogger(loglevel=loglevel) @@ -79,6 +81,8 @@ class X2goListSessionsCache(object): @type profile_name: C{str} """ + while self.protected: + gevent.sleep() try: del self.x2go_listsessions_cache[profile_name] except KeyError: pass @@ -122,6 +126,7 @@ class X2goListSessionsCache(object): @type update_mounts: C{bool} """ + self.protected = True self.last_listsessions_cache = copy.deepcopy(self.x2go_listsessions_cache) control_session = self.client_instance.client_control_session_of_profile_name(profile_name) if not self.x2go_listsessions_cache.has_key(profile_name): @@ -132,6 +137,7 @@ class X2goListSessionsCache(object): self._update_desktops(profile_name, control_session) if update_mounts: self._update_mounts(profile_name, control_session) + self.protected = False def _update_mounts(self, profile_name, control_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). [View Less]

1 0

python-x2go.git - master (branch) updated: 0.1.1.4-228-gfe53e1d
by git-admin＠x2go.org 24 Apr '12

24 Apr '12

The branch, master has been updated via fe53e1d162fc80671321f9904ecc47f2f59b8071 (commit) from 02b0cc37d1a1997269c3ffb5b2498748f77c8d1d (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 fe53e1d162fc80671321f9904ecc47f2f59b8071 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits April 2012