This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 8f25d944919e37713235d830042a3a0ae8da1590 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Oct 7 15:50:20 2014 +0200 Use File::Which to detect if sshfs command is available before trying to mount a client-side folder. Conflicts (resolved by Mike Gabriel): debian/control x2goserver/bin/x2gomountdirs --- debian/changelog | 8 +++++++- debian/control | 1 + x2goserver.spec | 1 + x2goserver/bin/x2gomountdirs | 14 ++++++++++++-- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 656b2e6..4e11960 100644 --- a/debian/changelog +++ b/debian/changelog @@ -126,7 +126,13 @@ x2goserver (4.1.0.0-0x2go1.1) UNRELEASED; urgency=low x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium - * Continue development... + * New upstream version (4.0.1.19): + - Use File::Which to detect if sshfs command is available + before trying to mount a client-side folder. + * debian/control: + + Add D (x2goserver): libfile-which-perl. + * x2goserver.spec: + + Add to R: perl(File::Which). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 07 Oct 2014 15:35:38 +0200 diff --git a/debian/control b/debian/control index a713dd6..93d2e8b 100644 --- a/debian/control +++ b/debian/control @@ -20,6 +20,7 @@ Depends: x2goserver-common (>= ${source:Version}), x2goserver-common (<< ${source:Version}.1~), ${misc:Depends}, libfile-basedir-perl, + libfile-which-perl, libtry-tiny-perl, libswitch-perl, libx2go-server-perl (>= ${source:Version}), libx2go-server-perl (<< ${source:Version}.1~), diff --git a/x2goserver.spec b/x2goserver.spec index 121f0ed..61391da 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -49,6 +49,7 @@ Requires: sudo Requires: x2goagent >= 3.5.0.25 Requires: xorg-x11-fonts-misc Requires: xorg-x11-xauth +Requires: perl(File::Which) Requires(pre): shadow-utils Requires(post): grep Requires(post): perl(DBD::SQLite) diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index 2a7d0e6..7c93a9e 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -22,7 +22,8 @@ use strict; use Sys::Syslog qw( :standard :macros ); -use File::BaseDir qw(xdg_config_home); +use File::BaseDir qw( xdg_config_home ); +use File::Which; use X2Go::Config qw( get_config ); use X2Go::Server::DB qw( db_insertmount db_deletemount ); @@ -35,6 +36,16 @@ setlogmask( LOG_UPTO(loglevel()) ); syslog('info', "x2gomountdirs has been called with options: @ARGV"); +my $msg; +if (! which ("sshfs") ) { + $msg = "the sshfs command is not installed on this X2Go Server, cannot share client-side folders"; + syslog('warning', "WARNING: $msg"); + print "$msg\n"; + # closing syslog + closelog; + exit 0; +} + my $tmp_dir = '/tmp'; my $type=shift; @@ -42,7 +53,6 @@ my $session=shift; my $user=shift; my $key=shift; my @dl; -my $msg; my $i=0; @dl[$i]=shift; while(@dl[$i]) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git