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 3b4e99b2e2f3f08a7bbf71ee45380616d01876d8 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Oct 3 15:57:19 2014 +0200 Fix unreliable removal of client-side folder sharing desktop icons. --- debian/changelog | 2 ++ x2goserver/bin/x2goumount-session | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 07afc25..4bf0f09 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ x2goserver (4.0.1.17-0x2go1) UNRELEASED; urgency=medium mysteriously disappeared (e.g. kill -9). (Fixes: #626). - Make sure that incompletely started up sessions get wiped from the session DB after 10 seconds. + - Fix unreliable removal of client-side folder sharing desktop + icons. * debian/control: + Upgrade x2goserver-xsession from Suggests: to Recommends:. diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session index 7446d68..94b2777 100755 --- a/x2goserver/bin/x2goumount-session +++ b/x2goserver/bin/x2goumount-session @@ -242,7 +242,7 @@ break: my @desktop_file_content=<DF>; close(DF); - if ( @desktop_file_content[1] eq $session ) { + if ( "@desktop_file_content[1]" eq "$session\n" ) { syslog('info', "removing desktop icon ,,$desktop_dir/$desktop_file''"); unlink("$desktop_dir/$desktop_file"); } -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git