x2go-commits September 2011

x2go-commits@lists.x2go.org

1 participants
268 discussions

x2goserver.git - master (branch) updated: 3.0.99-2-286-g17a9b39
by git-admin＠x2go.org 24 Sep '11

24 Sep '11

The branch, master has been updated via 17a9b394a9b61d85b81d80136d4fedfc91ec5ee1 (commit) from c50c4ba010d5d64543e284e44cc9ff6991250ccf (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 17a9b394a9b61d85b81d80136d4fedfc91ec5ee1 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Sep 24 21:38:26 2011 +0200 Identified x2goumount script (x2goserver-compat) as a necessary component of x2gognomebindings and moved it there (with new name: x2goumount-session-gnome). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 + x2goserver-compat/bin/x2goumount | 62 ------------------------------- x2goserver-compat/man/man8/x2goumount.8 | 23 ----------- 3 files changed, 2 insertions(+), 85 deletions(-) delete mode 100755 x2goserver-compat/bin/x2goumount delete mode 100644 x2goserver-compat/man/man8/x2goumount.8 The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 5eb5078..cdd1782 100644 --- a/debian/changelog +++ b/debian/changelog @@ -76,6 +76,8 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low * Split up x2goprint script + man page + adduser x2goprint as separate package x2goserver-printing. * Add man page for x2gobasepath and man page draft for x2gosessionlimit. + * Identified x2goumount script (x2goserver-compat) as a necessary component of + x2gognomebindings and moved it there (with new name: x2goumount-session-gnome). [ Ivan Kabaivanov ] * Makefile fix around man page installation in x2goserver-compat package. diff --git a/x2goserver-compat/bin/x2goumount b/x2goserver-compat/bin/x2goumount deleted file mode 100755 index 7d160f2..0000000 --- a/x2goserver-compat/bin/x2goumount +++ /dev/null @@ -1,62 +0,0 @@ -#!/usr/bin/perl - -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc., -# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# -# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> - -use strict; - -use lib "/usr/lib/x2go"; -use x2godbwrapper; - -my $fname=shift; -open(F,"<$fname") or die "can't open $fname"; -my $dir=<F>; -my $session=<F>; -close(F); - -$session=~s/\n//; - -chomp($dir); -my $uname=$ENV{'USER'}; - -my $use_zenity=0; - -if($ENV{'GNOME_DESKTOP_SESSION_ID'} ne "") -{ - $use_zenity=1; -} - -if(system( "fusermount -u $dir" ) == 0) -{ - unlink($fname); - db_deletemount( $session, $dir); - rmdir ($dir); -} -else -{ - if($use_zenity == 0) - { - system("kdialog --error \"Can't umount:\n $dir\"&"); - } - else - { - system("zenity --error --text \"Can't umount:\n $dir\"&"); - } -} diff --git a/x2goserver-compat/man/man8/x2goumount.8 b/x2goserver-compat/man/man8/x2goumount.8 deleted file mode 100644 index 628b616..0000000 --- a/x2goserver-compat/man/man8/x2goumount.8 +++ /dev/null @@ -1,23 +0,0 @@ -'\" -*- coding: utf-8 -*- -.if \n(.g .ds T< \\FC -.if \n(.g .ds T> \\F[\n[.fam]] -.de URL -\\$2 \(la\\$1\(ra\\$3 -.. -.if \n(.g .mso www.tmac -.TH x2goumount 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool" -.SH NAME -x2goumount \- X2go Server Script (deprecated, shipped for compatibility with old clients) -.SH SYNOPSIS -'nh -.fi -.ad l -x2goumount <arg1> <arg2> ... - -.SH DESCRIPTION -\fBx2goumount\fR is a deprecated script belonging to X2go Server. The availability of this script -is required to allow old local folder sharing to old \fBx2goclient\fR versions. -.PP -.SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project -(http://www.x2go.org). 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

x2gognomebindings.git - master (branch) updated: 2.0.1.1-8-g2d64da9
by git-admin＠x2go.org 24 Sep '11

24 Sep '11

The branch, master has been updated via 2d64da9939a9261dca99d739a545896fac7fb0ac (commit) from eca466be460f30cb34ce7f440e64f92c642fc2cb (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 2d64da9939a9261dca99d739a545896fac7fb0ac Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Sep 24 21:43:02 2011 +0200 * Preparing for new upstream version (2.0.1.3): - Move ,,x2goumount'' script into package as ,,x2goumount-session-gnome''. - Move x2gosuspend-session-gnome to /bin folder within package. - Add man apges for x2goumount-session-gnome, x2gosuspend-session-gnome. ----------------------------------------------------------------------- Summary of changes: {suspend => bin}/x2gosuspend-session-gnome | 0 bin/x2goumount-session-gnome | 62 ++++++++++++++++++++++++++++ debian/changelog | 6 ++- debian/rules | 1 - debian/x2gognomebindings.install | 2 + extension/nautilus-x2goumount.c | 4 +- man/man8/x2gosuspend-session-gnome.8 | 23 ++++++++++ man/man8/x2goumount-session-gnome.8 | 23 ++++++++++ 8 files changed, 117 insertions(+), 4 deletions(-) rename {suspend => bin}/x2gosuspend-session-gnome (100%) create mode 100755 bin/x2goumount-session-gnome create mode 100644 man/man8/x2gosuspend-session-gnome.8 create mode 100644 man/man8/x2goumount-session-gnome.8 The diff of changes is: diff --git a/suspend/x2gosuspend-session-gnome b/bin/x2gosuspend-session-gnome similarity index 100% rename from suspend/x2gosuspend-session-gnome rename to bin/x2gosuspend-session-gnome diff --git a/bin/x2goumount-session-gnome b/bin/x2goumount-session-gnome new file mode 100755 index 0000000..7d160f2 --- /dev/null +++ b/bin/x2goumount-session-gnome @@ -0,0 +1,62 @@ +#!/usr/bin/perl + +# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. +# +# Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> + +use strict; + +use lib "/usr/lib/x2go"; +use x2godbwrapper; + +my $fname=shift; +open(F,"<$fname") or die "can't open $fname"; +my $dir=<F>; +my $session=<F>; +close(F); + +$session=~s/\n//; + +chomp($dir); +my $uname=$ENV{'USER'}; + +my $use_zenity=0; + +if($ENV{'GNOME_DESKTOP_SESSION_ID'} ne "") +{ + $use_zenity=1; +} + +if(system( "fusermount -u $dir" ) == 0) +{ + unlink($fname); + db_deletemount( $session, $dir); + rmdir ($dir); +} +else +{ + if($use_zenity == 0) + { + system("kdialog --error \"Can't umount:\n $dir\"&"); + } + else + { + system("zenity --error --text \"Can't umount:\n $dir\"&"); + } +} diff --git a/debian/changelog b/debian/changelog index dbdcbff..e5c4c2b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,9 @@ -x2gognomebindings (2.0.1.2-0~x2go1) UNRELEASED; urgency=low +x2gognomebindings (2.0.1.3-0~x2go1) UNRELEASED; urgency=low + * New upstream version (2.0.1.3): + - Move ,,x2goumount'' script into package as ,,x2goumount-session-gnome''. + - Move x2gosuspend-session-gnome to /bin folder within package. + - Add man apges for x2goumount-session-gnome, x2gosuspend-session-gnome. * Add gnome-menus as dependency. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 24 Sep 2011 03:06:58 +0200 diff --git a/debian/rules b/debian/rules index a79b305..0940e81 100755 --- a/debian/rules +++ b/debian/rules @@ -32,7 +32,6 @@ install: build $(MAKE) DESTDIR=$(CURDIR)/debian/x2gognomebindings install $(MAKE) -C po DESTDIR=$(CURDIR)/debian/x2gognomebindings install install x2gonautilus/x2gonautilus $(CURDIR)/debian/x2gognomebindings/usr/bin/ - install suspend/x2gosuspend-session-gnome $(CURDIR)/debian/x2gognomebindings/usr/bin/ install updatemenu/update-gnome-menu-x2go $(CURDIR)/debian/x2gognomebindings/usr/sbin/ cp -ar share $(CURDIR)/debian/x2gognomebindings/usr/ cp updatemenu/gnome-settingsx2go.menu $(CURDIR)/debian/x2gognomebindings/etc/xdg/menus diff --git a/debian/x2gognomebindings.install b/debian/x2gognomebindings.install index b437a9f..fb933aa 100644 --- a/debian/x2gognomebindings.install +++ b/debian/x2gognomebindings.install @@ -1 +1,3 @@ +bin/x2gosuspend-session-gnome usr/bin/ +bin/x2goumount-session-gnome usr/bin/ VERSION.x2gognomebindings usr/share/x2go/versions/ diff --git a/extension/nautilus-x2goumount.c b/extension/nautilus-x2goumount.c index 80f33ed..8d7f63c 100644 --- a/extension/nautilus-x2goumount.c +++ b/extension/nautilus-x2goumount.c @@ -47,8 +47,8 @@ static void nautilus_x2goumount_execute (NautilusMenuItem *item) GList *files; files = (GList*)g_object_get_data (G_OBJECT (item), "files"); gchar* uri = nautilus_file_info_get_uri ((NautilusFileInfo *)files->data); - char* cmd=malloc(strlen(uri)+strlen("x2goumount")); - strcpy(cmd,"x2goumount "); + char* cmd=malloc(strlen(uri)+strlen("x2goumount-session-gnome")); + strcpy(cmd,"x2goumount-session-gnome "); strcat(cmd, uri+7); g_spawn_command_line_async (cmd, NULL); g_free (uri); diff --git a/man/man8/x2gosuspend-session-gnome.8 b/man/man8/x2gosuspend-session-gnome.8 new file mode 100644 index 0000000..749b7a9 --- /dev/null +++ b/man/man8/x2gosuspend-session-gnome.8 @@ -0,0 +1,23 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH x2gosuspend-session-gnome 8 "18 May 2011" "Version 3.0.99.x" "X2go GNOME Bindings" +.SH NAME +x2gosuspend-session-gnome \- X2go GNOME Binding for X2go Server: Suspend X2go Sessions from GNOME Menu +.SH SYNOPSIS +'nh +.fi +.ad l +x2gosuspend-session-gnome <session_id> + +.SH DESCRIPTION +\fBx2gosuspend-gnome-session\fR is a component of the X2go GNOME bindings and a simple wrapper around the X2go Server +script ,,x2gosuspend-session''--with the potentials to be customized for X2go on GNOME desktops. +.PP +.SH AUTHOR +This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +(http://www.x2go.org). diff --git a/man/man8/x2goumount-session-gnome.8 b/man/man8/x2goumount-session-gnome.8 new file mode 100644 index 0000000..f8d50ea --- /dev/null +++ b/man/man8/x2goumount-session-gnome.8 @@ -0,0 +1,23 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH x2goumount-session-gnome 8 "18 May 2011" "Version 3.0.99.x" "X2go GNOME Bindings" +.SH NAME +x2goumount-session-gnome \- X2go GNOME Binding for X2go Server: Unmount shared folder via Nautilus +.SH SYNOPSIS +'nh +.fi +.ad l +x2goumount-session-gnome <arg1> <arg2> ... + +.SH DESCRIPTION +\fBx2goumount-session-gnome\fR is a component of the X2go GNOME bindings. It is run if a user selects the ,,Unmount'' +action in the right-click context menu on X2go shared folder icons on the GNOME desktop. +.PP +.SH AUTHOR +This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +(http://www.x2go.org). hooks/post-receive -- x2gognomebindings.git (X2go bindings for GNOME) 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 "x2gognomebindings.git" (X2go bindings for GNOME).

1 0

python-x2go.git - master (branch) updated: 0.1.1.4-49-g4940e7a
by git-admin＠x2go.org 24 Sep '11

24 Sep '11

The branch, master has been updated via 4940e7aeb3cec0371e1d282b7818f5e6ce52453b (commit) from 4d3232c3b5fd7cff1c178035de801b37846fffbd (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 4940e7aeb3cec0371e1d282b7818f5e6ce52453b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Sep 24 11:49:19 2011 +0200 remove code duplications ----------------------------------------------------------------------- Summary of changes: x2go/backends/terminal/_stdout.py | 9 ++------- x2go/session.py | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index 0e72e77..6dab394 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -439,17 +439,12 @@ class X2goTerminalSessionSTDOUT(object): # tunnel has already been started and might simply need a resume call self.reverse_tunnels[self.session_info.name]['snd'][1].resume() - def is_folder_sharing_available(self): - if self.session_info.username in self.control_session._x2go_remote_group('fuse'): - return True - return False - def start_sshfs(self): """\ Initialize Paramiko/SSH reverse forwarding tunnel for X2go folder sharing. """ - if self.is_folder_sharing_available(): + if self.control_session.is_folder_sharing_available(): raise x2go_exceptions.X2goUserException('remote user %s is not member of X2go server group fuse' % self.session_info.username) # start reverse SSH tunnel for sshfs (folder sharing, printing) @@ -596,7 +591,7 @@ class X2goTerminalSessionSTDOUT(object): @rtype: bool """ - if self.is_folder_sharing_available(): + if self.control_session.is_folder_sharing_available(): raise x2go_exceptions.X2goUserException('remote user %s is not member of X2go server group fuse' % self.session_info.username) if local_path is None: diff --git a/x2go/session.py b/x2go/session.py index 5814748..aff19c1 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -1060,7 +1060,7 @@ class X2goSession(object): self.terminal_session and not self.faulty and self.terminal_session.start_mimebox(mimebox_extensions=self.mimebox_extensions, mimebox_action=self.mimebox_action) self.terminal_session and self.session_environment.update({'X2GO_MIMEBOX': self.terminal_session.get_mimebox_spooldir(), }) - if self._SUPPORTED_FOLDERSHARING and self.allow_share_local_folders and self.share_local_folders and self.terminal_session and not self.faulty and self.is_folder_sharing_available(): + if self.share_local_folders and self.terminal_session and not self.faulty and self.is_folder_sharing_available(): if _control.get_transport().reverse_tunnels[self.terminal_session.get_session_name()]['sshfs'][1] is not None: for _folder in self.share_local_folders: self.share_local_folder(_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

python-x2go.git - release/0.1.1.x (branch) updated: 0.1.1.6-21-ga5ed9d2
by git-admin＠x2go.org 24 Sep '11

24 Sep '11

The branch, release/0.1.1.x has been updated via a5ed9d2b9cb15374aa0e5205f728fd50efd04b6b (commit) from 142e587cb4bfe2b5a506ed20dac04eaba77f258a (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 a5ed9d2b9cb15374aa0e5205f728fd50efd04b6b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Sep 24 11:49:19 2011 +0200 remove code duplications ----------------------------------------------------------------------- Summary of changes: x2go/backends/terminal/_stdout.py | 9 ++------- x2go/session.py | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index 73a2844..51bee99 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -439,17 +439,12 @@ class X2goTerminalSessionSTDOUT(object): # tunnel has already been started and might simply need a resume call self.reverse_tunnels[self.session_info.name]['snd'][1].resume() - def is_folder_sharing_available(self): - if self.session_info.username in self.control_session._x2go_remote_group('fuse'): - return True - return False - def start_sshfs(self): """\ Initialize Paramiko/SSH reverse forwarding tunnel for X2go folder sharing. """ - if self.is_folder_sharing_available(): + if self.control_session.is_folder_sharing_available(): raise x2go_exceptions.X2goUserException('remote user %s is not member of X2go server group fuse' % self.session_info.username) # start reverse SSH tunnel for sshfs (folder sharing, printing) @@ -596,7 +591,7 @@ class X2goTerminalSessionSTDOUT(object): @rtype: bool """ - if self.is_folder_sharing_available(): + if self.control_session.is_folder_sharing_available(): raise x2go_exceptions.X2goUserException('remote user %s is not member of X2go server group fuse' % self.session_info.username) if local_path is None: diff --git a/x2go/session.py b/x2go/session.py index 3f39107..ed1e8b5 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -1060,7 +1060,7 @@ class X2goSession(object): self.terminal_session and not self.faulty and self.terminal_session.start_mimebox(mimebox_extensions=self.mimebox_extensions, mimebox_action=self.mimebox_action) self.terminal_session and self.session_environment.update({'X2GO_MIMEBOX': self.terminal_session.get_mimebox_spooldir(), }) - if self._SUPPORTED_FOLDERSHARING and self.allow_share_local_folders and self.share_local_folders and self.terminal_session and not self.faulty and self.is_folder_sharing_available(): + if self.share_local_folders and self.terminal_session and not self.faulty and self.is_folder_sharing_available(): if _control.get_transport().reverse_tunnels[self.terminal_session.get_session_name()]['sshfs'][1] is not None: for _folder in self.share_local_folders: self.share_local_folder(_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

python-x2go.git - release/0.1.1.x (branch) updated: 0.1.1.6-20-g142e587
by git-admin＠x2go.org 24 Sep '11

24 Sep '11

The branch, release/0.1.1.x has been updated via 142e587cb4bfe2b5a506ed20dac04eaba77f258a (commit) via 4d2df56dd9d1e5ef727dd8dd3ae861f09b8780b9 (commit) from 82e793ae95f1af4cb414147ee70e93fb5ea7ab42 (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 142e587cb4bfe2b5a506ed20dac04eaba77f258a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Sep 24 11:45:59 2011 +0200 setup.py fix to make release/0.1.1.x be in sync with master branch (2) commit 4d2df56dd9d1e5ef727dd8dd3ae861f09b8780b9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jul 18 15:16:08 2011 +0200 doc update ----------------------------------------------------------------------- Summary of changes: README | 22 +++++++++------------- TODO | 2 +- setup.py | 2 +- 3 files changed, 11 insertions(+), 15 deletions(-) The diff of changes is: diff --git a/README b/README index 933f874..aa0b9bd 100644 --- a/README +++ b/README @@ -70,26 +70,22 @@ and wholeheartedness concerning this inner process. Ubuntu: ------- -create /etc/apt/sources.list.d/nwt.list and put the following line into it: +We use Launchpad for Ubuntu packaging: -<snip> -deb http://packages.das-netzwerkteam.de/ubuntu {lucid|maverick|natty} main -</snip> - -If you run a newer Ubuntu version, replace »lucid« with your version (»maverick«, ...) - -Then run the following commands: + $ add-apt-repository ppa:x2go/stable + $ apt-get update + $ apt-get install python-x2go - $ sudo apt-get update - $ sudo apt-get install python-x2go +From Ubuntu oneiric on python-x2go is also available as a part of the +Ubuntu GNU/Linux distribution. Debian: ------- -create /etc/apt/sources.list.d/nwt.list and put the following line into it: +create /etc/apt/sources.list.d/x2go.list and put the following line into it: <snip> -deb http://packages.das-netzwerkteam.de/debian {squeeze|wheezy|sid} main +deb http://packages.x2go.org/debian {squeeze|wheezy|sid} main </snip> Then run the following commands as super-user root: @@ -134,6 +130,6 @@ check if your issues have already been solved in the HEAD of python-x2go code. For now, bugs can be reported via mail to mike.gabriel(a)das-netzwerkteam.de -light+love, 20110701 +light+love, 20110718 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> diff --git a/TODO b/TODO index 52ceb74..6b44905 100644 --- a/TODO +++ b/TODO @@ -4,7 +4,7 @@ Published under the terms of the GNU General Public License. See http://www.gnu.org/licenses/gpl.html for a recent copy. -=== pyhton-x2go TODOs === +=== python-x2go TODOs === as of 20110701 -------------- diff --git a/setup.py b/setup.py index 7c9345f..a0be2fa 100755 --- a/setup.py +++ b/setup.py @@ -30,5 +30,5 @@ setup( url = 'http://www.x2go.org', packages = find_packages('.'), package_dir = {'': '.'}, - install_requires = ['setuptools', "gevent", "paramiko", ] + install_requires = ['setuptools', 'gevent', 'paramiko', ] ) hooks/post-receive -- python-x2go.git (Python X2go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2go Client API).

1 0

python-x2go.git - release/0.1.1.x (branch) updated: 0.1.1.6-18-g82e793a
by git-admin＠x2go.org 24 Sep '11

24 Sep '11

The branch, release/0.1.1.x has been updated via 82e793ae95f1af4cb414147ee70e93fb5ea7ab42 (commit) from 38dbb697abfb29908554824ce34b000173322775 (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 82e793ae95f1af4cb414147ee70e93fb5ea7ab42 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Sep 24 11:43:18 2011 +0200 setup.py fix to make release/0.1.1.x be in sync with master branch ----------------------------------------------------------------------- Summary of changes: setup.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/setup.py b/setup.py index e8253b6..7c9345f 100755 --- a/setup.py +++ b/setup.py @@ -30,5 +30,5 @@ setup( url = 'http://www.x2go.org', packages = find_packages('.'), package_dir = {'': '.'}, - install_requires = ['setuptools', "gevent", "paramiko" ] + install_requires = ['setuptools', "gevent", "paramiko", ] ) hooks/post-receive -- python-x2go.git (Python X2go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2go Client API).

1 0

python-x2go.git - release/0.1.1.x (branch) updated: 0.1.1.6-17-g38dbb69
by git-admin＠x2go.org 24 Sep '11

24 Sep '11

The branch, release/0.1.1.x has been updated via 38dbb697abfb29908554824ce34b000173322775 (commit) via 8e23ff85e4203e551a109d354284b86ee015d905 (commit) from d1064100febd0837fa8b6d66b8efd13deb5780d0 (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 38dbb697abfb29908554824ce34b000173322775 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Sep 24 04:28:30 2011 +0200 Provide test method to query server if folder sharing is available. Test for existence of remote home directory on connect. commit 8e23ff85e4203e551a109d354284b86ee015d905 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Sep 24 04:29:52 2011 +0200 log message fix ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2go/backends/control/_stdout.py | 15 +++++++++++++++ x2go/backends/terminal/_stdout.py | 9 +++++++-- x2go/client.py | 27 +++++++++++++++++++++++++++ 4 files changed, 51 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index c0f9023..a8a6011 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,8 @@ python-x2go (0.1.1.7-0-x2go1) UNRELEASED; urgency=low method. - Compatibility fix for X2go folder sharing (session profile attribute: export). + - Provide test method to query server if folder sharing is available. + - Test for existence of remote home directory on connect. [ Dick Kniep ] * Fix for upstream version 0.1.1.7: diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index 4936189..e382493 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -256,6 +256,11 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): #return username in self._x2go_remote_group('x2gousers') return True + def is_folder_sharing_available(self): + if self.remote_username() in self._x2go_remote_group('fuse'): + return True + return False + def remote_username(self): """\ Returns the control session's remote username. @@ -486,6 +491,10 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): if self.get_transport(): self.session_died = False + + if not self.home_exists(): + raise x2go_exceptions.X2goControlSessionException('remote home directory does not exist') + return (self.get_transport() is not None) def dissociate(self, terminal_session): @@ -540,6 +549,12 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): return False + def home_exists(self): + if self._x2go_exec_command('stat -tL "%s"', loglevel=log.loglevel_DEBUG): + return True + return False + + def is_alive(self): if self._x2go_exec_command('echo', loglevel=log.loglevel_DEBUG): return True diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index af8212c..73a2844 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -439,12 +439,17 @@ class X2goTerminalSessionSTDOUT(object): # tunnel has already been started and might simply need a resume call self.reverse_tunnels[self.session_info.name]['snd'][1].resume() + def is_folder_sharing_available(self): + if self.session_info.username in self.control_session._x2go_remote_group('fuse'): + return True + return False + def start_sshfs(self): """\ Initialize Paramiko/SSH reverse forwarding tunnel for X2go folder sharing. """ - if self.session_info.username not in self.control_session._x2go_remote_group('fuse'): + if self.is_folder_sharing_available(): raise x2go_exceptions.X2goUserException('remote user %s is not member of X2go server group fuse' % self.session_info.username) # start reverse SSH tunnel for sshfs (folder sharing, printing) @@ -591,7 +596,7 @@ class X2goTerminalSessionSTDOUT(object): @rtype: bool """ - if self.session_info.username not in self.control_session._x2go_remote_group('fuse'): + if self.is_folder_sharing_available(): raise x2go_exceptions.X2goUserException('remote user %s is not member of X2go server group fuse' % self.session_info.username) if local_path is None: diff --git a/x2go/client.py b/x2go/client.py index 5914918..0d4061b 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -1470,6 +1470,33 @@ class X2goClient(object): return session_name not in [ s for s in self.server_running_sessions(session_uuid) + self.server_suspended_sessions(session_uuid) ] __has_session_terminated = has_session_terminated + def is_folder_sharing_available(self, session_uuid=None, profile_name=None): + """\ + Test if local folder sharing is available for X2go session with unique ID <session_uuid> or + session profile <profile_name>. + + @param session_uuid: the X2go session's UUID registry hash + @type session_uuid: C{str} + @param profile_name: alternatively, the profile name can be used to perform this query + @type profile_name: C{str} + + @return: returns C{True} if the profile/session supports local folder sharing + @rtype: C{bool} + + """ + if session_uuid is None and profile_name: + _connected = self._X2goClient__client_connected_sessions_of_profile_name(profile_name, return_objects=False) + if len(_connected) > 0: + session_uuid = _connected[0] + if session_uuid: + return self.session_registry(session_uuid).is_folder_sharing_available() + else: + self.logger('Cannot find a terminal session for profile ,,%s\'\' that can be used to query folder sharing capabilities' % profile_name, loglevel=log.loglevel_WARN) + return False + __is_folder_sharing_available = is_folder_sharing_available + __profile_is_folder_sharing_available = is_folder_sharing_available + __session_is_folder_sharing_available = is_folder_sharing_available + def share_local_folder(self, session_uuid=None, local_path=None, profile_name=None, folder_name=None): """\ Share a local folder with the X2go session registered as C{session_uuid}. hooks/post-receive -- python-x2go.git (Python X2go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2go Client API).

1 0

python-x2go.git - release/0.1.1.x (branch) updated: 0.1.1.6-15-gd106410
by git-admin＠x2go.org 24 Sep '11

24 Sep '11

The branch, release/0.1.1.x has been updated via d1064100febd0837fa8b6d66b8efd13deb5780d0 (commit) from 396398819979ac483f7f48c5dbf18055767f2a9e (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 d1064100febd0837fa8b6d66b8efd13deb5780d0 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Sep 24 09:27:22 2011 +0200 be more precise, when allowing local folder sharing ----------------------------------------------------------------------- Summary of changes: x2go/session.py | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/x2go/session.py b/x2go/session.py index 4239459..3f39107 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -1060,7 +1060,7 @@ class X2goSession(object): self.terminal_session and not self.faulty and self.terminal_session.start_mimebox(mimebox_extensions=self.mimebox_extensions, mimebox_action=self.mimebox_action) self.terminal_session and self.session_environment.update({'X2GO_MIMEBOX': self.terminal_session.get_mimebox_spooldir(), }) - if self._SUPPORTED_FOLDERSHARING and self.share_local_folders and self.terminal_session and not self.faulty: + if self._SUPPORTED_FOLDERSHARING and self.allow_share_local_folders and self.share_local_folders and self.terminal_session and not self.faulty and self.is_folder_sharing_available(): if _control.get_transport().reverse_tunnels[self.terminal_session.get_session_name()]['sshfs'][1] is not None: for _folder in self.share_local_folders: self.share_local_folder(_folder) @@ -1388,6 +1388,20 @@ class X2goSession(object): return self.terminated __has_terminated = has_terminated + def is_folder_sharing_available(self): + """\ + Test if the remote session allows sharing of local folders with the session. + + @return: returns C{True} if local folder sharing is available in the remote session + @rtype: C{bool} + + """ + if self._SUPPORTED_FOLDERSHARING and self.allow_share_local_folders: + if self.is_connected(): + return self.control_session.is_folder_sharing_available() + else: + self.logger('local folder sharing is disabled for this session profile', loglevel=log.loglevel_WARN) + def share_local_folder(self, local_path=None, folder_name=None): """\ Share a local folder with this registered X2go session. @@ -1407,7 +1421,7 @@ class X2goSession(object): if folder_name: local_path=folder_name if self.has_terminal_session(): - if self.allow_share_local_folders: + if self._SUPPORTED_FOLDERSHARING and self.allow_share_local_folders: if self.terminal_session.share_local_folder(local_path=local_path): self.shared_folders.append(local_path) return True @@ -1432,7 +1446,7 @@ class X2goSession(object): """ if self.has_terminal_session(): - if self.allow_share_local_folders: + if self._SUPPORTED_FOLDERSHARING and self.allow_share_local_folders: if force_all: self.shared_folders = [] return self.terminal_session.unshare_all_local_folders() @@ -1463,7 +1477,7 @@ class X2goSession(object): """ if self.has_terminal_session(): - if self.allow_share_local_folders and local_path in self.shared_folders: + if self._SUPPORTED_FOLDERSHARING and self.allow_share_local_folders and local_path in self.shared_folders: self.shared_folders.remove(local_path) return self.terminal_session.unshare_local_folder(local_path=local_path) else: 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-48-g4d3232c
by git-admin＠x2go.org 24 Sep '11

24 Sep '11

The branch, master has been updated via 4d3232c3b5fd7cff1c178035de801b37846fffbd (commit) from 17a51ab4b2ab1f1237d4fe0e9ccd5aa9d98235c3 (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 4d3232c3b5fd7cff1c178035de801b37846fffbd Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Sep 24 09:27:22 2011 +0200 be more precise, when allowing local folder sharing ----------------------------------------------------------------------- Summary of changes: x2go/session.py | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/x2go/session.py b/x2go/session.py index e9baf78..5814748 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -1060,7 +1060,7 @@ class X2goSession(object): self.terminal_session and not self.faulty and self.terminal_session.start_mimebox(mimebox_extensions=self.mimebox_extensions, mimebox_action=self.mimebox_action) self.terminal_session and self.session_environment.update({'X2GO_MIMEBOX': self.terminal_session.get_mimebox_spooldir(), }) - if self._SUPPORTED_FOLDERSHARING and self.share_local_folders and self.terminal_session and not self.faulty and self.is_folder_sharing_available(): + if self._SUPPORTED_FOLDERSHARING and self.allow_share_local_folders and self.share_local_folders and self.terminal_session and not self.faulty and self.is_folder_sharing_available(): if _control.get_transport().reverse_tunnels[self.terminal_session.get_session_name()]['sshfs'][1] is not None: for _folder in self.share_local_folders: self.share_local_folder(_folder) @@ -1396,8 +1396,11 @@ class X2goSession(object): @rtype: C{bool} """ - if self.is_connected(): - return self.control_session.is_folder_sharing_available() + if self._SUPPORTED_FOLDERSHARING and self.allow_share_local_folders: + if self.is_connected(): + return self.control_session.is_folder_sharing_available() + else: + self.logger('local folder sharing is disabled for this session profile', loglevel=log.loglevel_WARN) def share_local_folder(self, local_path=None, folder_name=None): """\ @@ -1418,7 +1421,7 @@ class X2goSession(object): if folder_name: local_path=folder_name if self.has_terminal_session(): - if self.allow_share_local_folders: + if self._SUPPORTED_FOLDERSHARING and self.allow_share_local_folders: if self.terminal_session.share_local_folder(local_path=local_path): self.shared_folders.append(local_path) return True @@ -1443,7 +1446,7 @@ class X2goSession(object): """ if self.has_terminal_session(): - if self.allow_share_local_folders: + if self._SUPPORTED_FOLDERSHARING and self.allow_share_local_folders: if force_all: self.shared_folders = [] return self.terminal_session.unshare_all_local_folders() @@ -1474,7 +1477,7 @@ class X2goSession(object): """ if self.has_terminal_session(): - if self.allow_share_local_folders and local_path in self.shared_folders: + if self._SUPPORTED_FOLDERSHARING and self.allow_share_local_folders and local_path in self.shared_folders: self.shared_folders.remove(local_path) return self.terminal_session.unshare_local_folder(local_path=local_path) else: 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-47-g17a51ab
by git-admin＠x2go.org 24 Sep '11

24 Sep '11

The branch, master has been updated via 17a51ab4b2ab1f1237d4fe0e9ccd5aa9d98235c3 (commit) from e79d565285b37a4f348a3c796f41a637718680fb (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 17a51ab4b2ab1f1237d4fe0e9ccd5aa9d98235c3 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Sep 24 04:29:52 2011 +0200 log message fix ----------------------------------------------------------------------- Summary of changes: x2go/client.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/x2go/client.py b/x2go/client.py index 0a34f99..4258b46 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -1491,7 +1491,7 @@ class X2goClient(object): if session_uuid: return self.session_registry(session_uuid).is_folder_sharing_available() else: - self.logger('Cannot find a terminal session for profile ,,%s\'\' to share a local folder with' % profile_name, loglevel=log.loglevel_WARN) + self.logger('Cannot find a terminal session for profile ,,%s\'\' that can be used to query folder sharing capabilities' % profile_name, loglevel=log.loglevel_WARN) return False __is_folder_sharing_available = is_folder_sharing_available __profile_is_folder_sharing_available = is_folder_sharing_available 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
...
27
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits September 2011