This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 2b3f4b7750e009543ef2d3d1bbd129329b636cfd Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Feb 28 16:17:39 2014 +0100 If x2goumount-session is used without cmd option <session_id>, then the env var $X2GO_SESSION (current session) will be attempted to used. --- debian/changelog | 2 ++ x2goserver/bin/x2golistmounts | 2 +- x2goserver/bin/x2goumount-session | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2dd7b47..34f59eb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -104,6 +104,8 @@ x2goserver (4.0.1.14-0x2go1) UNRELEASED; urgency=low (Fixes: #415). - If x2golistmounts is used with out cmd options <session_id>, then the env var $X2GO_SESSION (current session) will be used. + - If x2goumount-session is used without cmd option <session_id>, then + the env var $X2GO_SESSION (current session) will be attempted to used. - Fix x2gostartagent. Make sure the -nolisten tcp option is configurable via x2goagent.options. (Fixes: #424). - Safely remove desktop files for client-side shared folders. Remove diff --git a/x2goserver/bin/x2golistmounts b/x2goserver/bin/x2golistmounts index c05ae2c..1e5447c 100755 --- a/x2goserver/bin/x2golistmounts +++ b/x2goserver/bin/x2golistmounts @@ -29,7 +29,7 @@ use X2Go::Log qw(loglevel); openlog($0,'cons,pid','user'); setlogmask( LOG_UPTO(loglevel()) ); -my $session_id=shift || $ENV{'X2GO_SESSION'} or die; +my $session_id=shift || $ENV{'X2GO_SESSION'} or die "no valid session name that we can use"; my $mounts = join("\n", db_getmounts($session_id)); print "$mounts\n"; diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session index e7f3acb..14b6031 100755 --- a/x2goserver/bin/x2goumount-session +++ b/x2goserver/bin/x2goumount-session @@ -38,7 +38,7 @@ syslog('info', "x2goumount-session has been called with options: @ARGV"); my $tmp_dir = '/tmp'; -my $session=shift; +my $session=shift || $ENV{'X2GO_SESSION'} or die "no valid session name that we can use"; my $only_path=shift; my $uname="$ENV{'USER'}"; my $serv=hostname; -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git