This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch release/4.0.1.x in repository x2goserver. from f7ba8f8 Safely remove desktop files for client-side shared folders. Remove the correct desktop file, even if the shared folder has already been (forcefully) umounted. Such situations occur in cases where the connection gets interrupted. SSHFS will then get removed by the Linux kernel and we have to "guess" what desktop icons is actually to be removed. new 16bb3b6 If x2goumount-session is used without cmd option <session_id>, then the env var $X2GO_SESSION (current session) will be attempted to used. new b3bcef1 rephrase changelog line The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 6 ++++-- x2goserver/bin/x2golistmounts | 2 +- x2goserver/bin/x2goumount-session | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.1.x in repository x2goserver. commit 16bb3b6a562632b5ba7e8eea316399fcf01987ab 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 9ad3570..d482c66 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,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 fa1b6c9..8947ef9 100755 --- a/x2goserver/bin/x2golistmounts +++ b/x2goserver/bin/x2golistmounts @@ -31,7 +31,7 @@ openlog($0,'cons,pid','user'); setlogmask( LOG_UPTO(x2gologlevel()) ); -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 372acad..8e0c6d1 100755 --- a/x2goserver/bin/x2goumount-session +++ b/x2goserver/bin/x2goumount-session @@ -61,7 +61,7 @@ sub source_environment { 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
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.1.x in repository x2goserver. commit b3bcef1ae2eb2a5efb8299e02b18ea626eb5746d Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Feb 28 16:18:18 2014 +0100 rephrase changelog line --- debian/changelog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index d482c66..ca530ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,10 +4,10 @@ x2goserver (4.0.1.14-0x2go1) UNRELEASED; urgency=low * New upstream release (4.0.1.14): - Log SSHFS output and errors to ~/.x2go/C-<session>/sshfs-mounts.log. (Fixes: #415). - - If x2golistmounts is used with out cmd options <session_id>, then - the env var $X2GO_SESSION (current session) will be used. + - If x2golistmounts is used without cmd option <session_id>, then + the env var $X2GO_SESSION (current session) will be attempted to use. - If x2goumount-session is used without cmd option <session_id>, then - the env var $X2GO_SESSION (current session) will be attempted to used. + the env var $X2GO_SESSION (current session) will be attempted to use. - 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 -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org