x2go-commits April 2012

x2go-commits@lists.x2go.org

1 participants
194 discussions

x2goserver.git - backport-lenny (branch) updated: 3.1.0.1-40-g6516ccc
by git-admin＠x2go.org 12 Apr '12

12 Apr '12

The branch, backport-lenny has been updated via 6516ccc2da451b5b8d3e3559b51aa6bc09c8c1a0 (commit) from 28ca81e12fbf0b2326f654985f09366e50ad3fd5 (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 6516ccc2da451b5b8d3e3559b51aa6bc09c8c1a0 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Apr 12 16:59:26 2012 +0200 Add/fix Python X2Go folder sharing/unsharing support from Windows. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 16 ++++++++++++---- x2goserver/bin/x2gomountdirs | 6 ++++-- x2goserver/bin/x2goumount-session | 27 +++++++++++++++++++++++---- 3 files changed, 39 insertions(+), 10 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 087ef49..b2f3ed2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,20 @@ -x2goserver (3.1.1.0-0~x2go+bpo+lenny1) unstable; urgency=low +x2goserver (3.1.1.1-0~x2go+bpo+lenny1) UNRELEASED; urgency=low - * Backport current status of x2goserver (unreleased 3.1.1.0) to + * Backport current status of x2goserver (unreleased 3.1.1.1) to Debian lenny. * No DBI method sqlite_busy_timeout available on Debian lenny. - + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 05 Apr 2012 15:37:39 +0200 -x2goserver (3.1.1.0-0~x2go1) UNRELEASED; urgency=low +x2goserver (3.1.1.1-0~x2go1) UNRELEASED; urgency=low + + [ Mike Gabriel ] + * New upstream version (3.1.1.1): + - Add/fix Python X2Go folder sharing/unsharing support from Windows. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 04 Apr 2012 11:44:14 +0200 + +x2goserver (3.1.1.0-0~x2go1) unstable; urgency=low [ Mike Gabriel ] * New upstream version (3.1.1.0): diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index 58f3590..77ac985 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -232,7 +232,8 @@ for (my $i=0;$i<@dirs;$i++) } $p=~s/\//_/g; $p=~s/ /_/g; - $p=~s/_cygdrive_//g; + $p=~s/~_cygdrive_//; + $p=~s/~_windrive_//; $p=~s/~//g; mkdir("$mdir/$p"); $mntpath="$mdir/$p"; @@ -283,7 +284,8 @@ for (my $i=0;$i<@dirs;$i++) } my $p=@dirs[$i]; - $p=~s/\/cygdrive\///g; + $p=~s/\/cygdrive\///; + $p=~s/\/windrive\///; $p=~s/\//_/g; $fname="$fname/$p"; if ("$current_desktop" ne "NONE") diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session index 88bc7fc..db99392 100755 --- a/x2goserver/bin/x2goumount-session +++ b/x2goserver/bin/x2goumount-session @@ -44,12 +44,19 @@ my $serv=hostname; if ($only_path) { $only_path=~s/\/ramdrive\/mnt\///; + + # rewrite local unix path $only_path=~ s/\//_/g; + + # rewrite local Windows path + $only_path=~ s/^([a-zA-Z]:)/_cygdrive_\1/; + $only_path=~ s/://; + $only_path=~ s/\\/_/g; ### FIXME: handle CDROM and Removable Media mounts here, as well!!! $only_path="$tmp_dir/$ENV{'USER'}_media/disk/$only_path"; - # ^^^^ + # ^^^^ syslog('debug',"x2goumount-session unmounting $only_path only"); } @@ -84,8 +91,19 @@ for ($i=0;$i<@outp;$i++) { if (@line[1] ne $only_path) { - syslog('debug', "skipping non-requested path @line[1]"); - goto cont; + # this is for Python X2Go, the base of Windows mounted shares starts with _windrive, not _cygdrive + my $only_path_windrive=$only_path; + $only_path_windrive=~ s/_cygdrive_/_windrive_/; + + if (@line[1] ne $only_path_windrive) + { + syslog('debug', "skipping non-requested path @line[1]"); + goto cont; + } + else + { + $only_path = $only_path_windrive; + } } } my $j; @@ -126,7 +144,8 @@ break: if (! $found) { - $remote=~s/\/cygdrive\///g; + $remote=~s/\/cygdrive\///; + $remote=~s/\/windrive\///; $remote=~s/\//_/g; $remote=(split(":","$remote"))[1]; $remote="$ENV{'HOME'}/Desktop/$remote"; 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.0-2-g5fc633c
by git-admin＠x2go.org 12 Apr '12

12 Apr '12

The branch, master has been updated via 5fc633c06d3c39bf77c95afde55ed3c6236cde0c (commit) from eddd060e73c5011585af52f8fdb74c63f3993e12 (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 5fc633c06d3c39bf77c95afde55ed3c6236cde0c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Apr 12 16:59:26 2012 +0200 Add/fix Python X2Go folder sharing/unsharing support from Windows. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 +++- x2goserver/bin/x2gomountdirs | 6 ++++-- x2goserver/bin/x2goumount-session | 27 +++++++++++++++++++++++---- 3 files changed, 30 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 771df31..ea139c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ x2goserver (3.1.1.1-0~x2go1) UNRELEASED; urgency=low - * Continue development... + [ Mike Gabriel ] + * New upstream version (3.1.1.1): + - Add/fix Python X2Go folder sharing/unsharing support from Windows. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 04 Apr 2012 11:44:14 +0200 diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index 58f3590..77ac985 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -232,7 +232,8 @@ for (my $i=0;$i<@dirs;$i++) } $p=~s/\//_/g; $p=~s/ /_/g; - $p=~s/_cygdrive_//g; + $p=~s/~_cygdrive_//; + $p=~s/~_windrive_//; $p=~s/~//g; mkdir("$mdir/$p"); $mntpath="$mdir/$p"; @@ -283,7 +284,8 @@ for (my $i=0;$i<@dirs;$i++) } my $p=@dirs[$i]; - $p=~s/\/cygdrive\///g; + $p=~s/\/cygdrive\///; + $p=~s/\/windrive\///; $p=~s/\//_/g; $fname="$fname/$p"; if ("$current_desktop" ne "NONE") diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session index 88bc7fc..db99392 100755 --- a/x2goserver/bin/x2goumount-session +++ b/x2goserver/bin/x2goumount-session @@ -44,12 +44,19 @@ my $serv=hostname; if ($only_path) { $only_path=~s/\/ramdrive\/mnt\///; + + # rewrite local unix path $only_path=~ s/\//_/g; + + # rewrite local Windows path + $only_path=~ s/^([a-zA-Z]:)/_cygdrive_\1/; + $only_path=~ s/://; + $only_path=~ s/\\/_/g; ### FIXME: handle CDROM and Removable Media mounts here, as well!!! $only_path="$tmp_dir/$ENV{'USER'}_media/disk/$only_path"; - # ^^^^ + # ^^^^ syslog('debug',"x2goumount-session unmounting $only_path only"); } @@ -84,8 +91,19 @@ for ($i=0;$i<@outp;$i++) { if (@line[1] ne $only_path) { - syslog('debug', "skipping non-requested path @line[1]"); - goto cont; + # this is for Python X2Go, the base of Windows mounted shares starts with _windrive, not _cygdrive + my $only_path_windrive=$only_path; + $only_path_windrive=~ s/_cygdrive_/_windrive_/; + + if (@line[1] ne $only_path_windrive) + { + syslog('debug', "skipping non-requested path @line[1]"); + goto cont; + } + else + { + $only_path = $only_path_windrive; + } } } my $j; @@ -126,7 +144,8 @@ break: if (! $found) { - $remote=~s/\/cygdrive\///g; + $remote=~s/\/cygdrive\///; + $remote=~s/\/windrive\///; $remote=~s/\//_/g; $remote=(split(":","$remote"))[1]; $remote="$ENV{'HOME'}/Desktop/$remote"; 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.1.1.4-183-gcd63f79
by git-admin＠x2go.org 12 Apr '12

12 Apr '12

The branch, master has been updated via cd63f79b6d3198664fe026e0842c705f7924d86b (commit) from 1724680c0d7d7b1182b2dd7a6032a51ed7224478 (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 cd63f79b6d3198664fe026e0842c705f7924d86b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Apr 12 15:31:28 2012 +0200 fix detection of shared folders on Windows ----------------------------------------------------------------------- Summary of changes: x2go/session.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/x2go/session.py b/x2go/session.py index f5b621f..567b9d4 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -1972,7 +1972,8 @@ class X2goSession(object): mount = mount.split('|')[1] if _X2GOCLIENT_OS == 'Windows': _driveletter, _path = os.path.splitdrive(shared_folder) - _mount_point = '_windrive_%s_%s' % (_driveletter, _path.replace('\\', '_')) + _mount_point = '_windrive_%s%s' % (_driveletter[0], _path.replace('\\', '_')) + if mount.lower().endswith(_mount_point.lower()): _found = True break 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-182-g1724680
by git-admin＠x2go.org 12 Apr '12

12 Apr '12

The branch, master has been updated via 1724680c0d7d7b1182b2dd7a6032a51ed7224478 (commit) from ac9bcecf496ab76a31bea28fddfa0a1af08faaeb (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 1724680c0d7d7b1182b2dd7a6032a51ed7224478 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Apr 12 15:08:29 2012 +0200 typo fix ----------------------------------------------------------------------- Summary of changes: x2go/session.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/x2go/session.py b/x2go/session.py index c74d580..f5b621f 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -1972,7 +1972,7 @@ class X2goSession(object): mount = mount.split('|')[1] if _X2GOCLIENT_OS == 'Windows': _driveletter, _path = os.path.splitdrive(shared_folder) - _mount_point = '_windrive_%s_%s' % (_driveletter, _path.replace('\\', '_') + _mount_point = '_windrive_%s_%s' % (_driveletter, _path.replace('\\', '_')) if mount.lower().endswith(_mount_point.lower()): _found = True break 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-181-gac9bcec
by git-admin＠x2go.org 12 Apr '12

12 Apr '12

The branch, master has been updated via ac9bcecf496ab76a31bea28fddfa0a1af08faaeb (commit) from 295486c5dd26572b86ae9d383557464ac78d4651 (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 ac9bcecf496ab76a31bea28fddfa0a1af08faaeb Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Apr 12 15:06:47 2012 +0200 Fix X2goSession.get_shared_folders() method on Windows. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/session.py | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 9cb36b8..2838876 100644 --- a/debian/changelog +++ b/debian/changelog @@ -85,6 +85,7 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Use double-quotes for pulseaudio options. - Export X2GO_SESSION and PULSE_CLIENTCONFIG to published applications. - When starting pulseaudio on Windows use --exit-idle-time=0. + - Fix X2goSession.get_shared_folders() method on Windows. * Depend on python-xlib. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 28 Sep 2012 01:44:21 +0100 diff --git a/x2go/session.py b/x2go/session.py index 49816cf..c74d580 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -52,6 +52,7 @@ from x2go.backends.proxy import X2goProxy as _X2goProxy from x2go.backends.settings import X2goClientSettings as _X2goClientSettings from x2go.backends.printing import X2goClientPrinting as _X2goClientPrinting +from defaults import X2GOCLIENT_OS as _X2GOCLIENT_OS from defaults import LOCAL_HOME as _LOCAL_HOME from defaults import X2GO_CLIENT_ROOTDIR as _X2GO_CLIENT_ROOTDIR from defaults import X2GO_SESSIONS_ROOTDIR as _X2GO_SESSIONS_ROOTDIR @@ -1969,10 +1970,17 @@ class X2goSession(object): for mount in mounts: mount = mount.split('|')[1] - _mount_point = shared_folder.replace('/', '_') - if mount.endswith(_mount_point): - _found = True - break + if _X2GOCLIENT_OS == 'Windows': + _driveletter, _path = os.path.splitdrive(shared_folder) + _mount_point = '_windrive_%s_%s' % (_driveletter, _path.replace('\\', '_') + if mount.lower().endswith(_mount_point.lower()): + _found = True + break + else: + _mount_point = shared_folder.replace('/', '_') + if mount.endswith(_mount_point): + _found = True + break if not _found: unshared_folders.append(shared_folder) 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

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

12 Apr '12

The branch, master has been updated via e8c677fb2e9550c67b1442d14d0670bbdfdaa967 (commit) from cd95b031031bc9a28b678787b43fefe735cb0d0d (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 e8c677fb2e9550c67b1442d14d0670bbdfdaa967 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Apr 12 14:36:50 2012 +0200 fix for last commit ----------------------------------------------------------------------- Summary of changes: pyhoca/wxgui/menus_taskbar.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py index 11d29e0..3ff0cd0 100644 --- a/pyhoca/wxgui/menus_taskbar.py +++ b/pyhoca/wxgui/menus_taskbar.py @@ -284,7 +284,7 @@ class PyHocaGUI_Menu_TaskbarProfileSharedFolders(wx.Menu): for _folder in _exported_folders_list: if ':' not in _folder: _folder = '%s:1' % _folder - _folder_path = _folder.split(':')[:-1] + _folder_path = ':'.join(_folder.split(':')[:-1]) _sharable_folders.append(_folder_path) self._PyHocaGUI._eventid_unshared_folders_map={} 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.10-188-gcd95b03
by git-admin＠x2go.org 12 Apr '12

12 Apr '12

The branch, master has been updated via cd95b031031bc9a28b678787b43fefe735cb0d0d (commit) from 62ed99536d9f741df7033bb890eaab468869e412 (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 cd95b031031bc9a28b678787b43fefe735cb0d0d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Apr 12 14:34:43 2012 +0200 Fix folder path extraction from session profile config if client-side folders contain a Windows drive letter. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ pyhoca/wxgui/menus_taskbar.py | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 871f88f..8ff81e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -99,6 +99,8 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Implement X2Go-Top category in .desktop files that get used in the context of published applications. - Allow one PyHoca-GUI instance per user, not per system. + - Fix folder path extraction from session profile config if client-side + folders contain a Windows drive letter. * Depend on Python X2Go 0.1.2.0. * Install GNOME icons via dh_links. * Install X2Go icons with explicit install paths. diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py index feeeb4e..11d29e0 100644 --- a/pyhoca/wxgui/menus_taskbar.py +++ b/pyhoca/wxgui/menus_taskbar.py @@ -284,7 +284,7 @@ class PyHocaGUI_Menu_TaskbarProfileSharedFolders(wx.Menu): for _folder in _exported_folders_list: if ':' not in _folder: _folder = '%s:1' % _folder - _folder_path = _folder.split(':')[0] + _folder_path = _folder.split(':')[:-1] _sharable_folders.append(_folder_path) self._PyHocaGUI._eventid_unshared_folders_map={} 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 - master (branch) updated: 0.1.1.4-180-g295486c
by git-admin＠x2go.org 12 Apr '12

12 Apr '12

The branch, master has been updated via 295486c5dd26572b86ae9d383557464ac78d4651 (commit) from 556b1fcadde9169b97cf9eb0fe02786bd608891c (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 295486c5dd26572b86ae9d383557464ac78d4651 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Apr 12 14:26:40 2012 +0200 fix for last commit ----------------------------------------------------------------------- Summary of changes: x2go/pulseaudio.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/x2go/pulseaudio.py b/x2go/pulseaudio.py index 95a25a6..31ed9a9 100644 --- a/x2go/pulseaudio.py +++ b/x2go/pulseaudio.py @@ -91,7 +91,7 @@ class X2goPulseAudio(threading.Thread): cmd = 'pulseaudio.exe' cmd_options = [ '-n', - '--exit-idle-time=0', + '--exit-idle-time=65535', '-L "module-native-protocol-tcp port=4713"', '-L "module-esound-protocol-tcp port=16001"', '-L module-waveout', 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-179-g556b1fc
by git-admin＠x2go.org 12 Apr '12

12 Apr '12

The branch, master has been updated via 556b1fcadde9169b97cf9eb0fe02786bd608891c (commit) from 2b4f8d4b2707295cce434da9e83fd8ef5398ccb9 (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 556b1fcadde9169b97cf9eb0fe02786bd608891c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Apr 12 14:18:45 2012 +0200 When starting pulseaudio on Windows use --exit-idle-time=0. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/pulseaudio.py | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 6d4259f..9cb36b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -84,6 +84,7 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low unused local port and write this port change to the session profile. - Use double-quotes for pulseaudio options. - Export X2GO_SESSION and PULSE_CLIENTCONFIG to published applications. + - When starting pulseaudio on Windows use --exit-idle-time=0. * Depend on python-xlib. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 28 Sep 2012 01:44:21 +0100 diff --git a/x2go/pulseaudio.py b/x2go/pulseaudio.py index 3ae1821..95a25a6 100644 --- a/x2go/pulseaudio.py +++ b/x2go/pulseaudio.py @@ -91,6 +91,7 @@ class X2goPulseAudio(threading.Thread): cmd = 'pulseaudio.exe' cmd_options = [ '-n', + '--exit-idle-time=0', '-L "module-native-protocol-tcp port=4713"', '-L "module-esound-protocol-tcp port=16001"', '-L module-waveout', 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-178-g2b4f8d4
by git-admin＠x2go.org 12 Apr '12

12 Apr '12

The branch, master has been updated via 2b4f8d4b2707295cce434da9e83fd8ef5398ccb9 (commit) from 5b425f7235bca1f4c49cc176172e230b63d3296c (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 2b4f8d4b2707295cce434da9e83fd8ef5398ccb9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Apr 12 13:56:39 2012 +0200 Export X2GO_SESSION and PULSE_CLIENTCONFIG to published applications. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/backends/terminal/_stdout.py | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f2d9527..6d4259f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -83,6 +83,7 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - If the SSH proxy connection tries to bind to a used port, detect an unused local port and write this port change to the session profile. - Use double-quotes for pulseaudio options. + - Export X2GO_SESSION and PULSE_CLIENTCONFIG to published applications. * 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 076ae8f..2328925 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -1036,10 +1036,20 @@ class X2goTerminalSessionSTDOUT(object): @param exec_name: application to be executed @type exec_name: C{str} """ - cmd_line = [ "export DISPLAY=:%s && " % str(self.session_info.display), - "setsid %s" % exec_name, - "&> /dev/null & exit", - ] + cmd_line = [ + "export DISPLAY=:%s &&" % str(self.session_info.display), + "export X2GO_SESSION=%s &&" % str(self.get_session_name()), + ] + + if self.params.snd_system == 'pulse': + cmd_line.append("export PULSE_CLIENTCONFIG=%s/.pulse-client.conf &&" % self.session_info.remote_container) + + cmd_line.extend( + [ + "setsid %s" % exec_name, + "&> /dev/null & exit", + ] + ) self.logger('executing published application %s for %s with command line: %s' % (exec_name, self.profile_name, cmd_line), loglevel=log.loglevel_DEBUG) (stdin, stdout, stderr) = self.control_session._x2go_exec_command(cmd_line) 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
...
9
10
11
12
13
14
15
...
20
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits April 2012