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 34be618 Use File::Which to detect if sshfs command is available before trying to mount a client-side folder. new c3c2e3d Be a bit more tolerant when trying to detect if a desktop icon is to be removed (using regexp, not eq). The 1 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 | 3 +++ x2goserver/bin/x2goumount-session | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) -- 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 c3c2e3d284ee523f168d91fce5b1a7d82189d039 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Oct 7 22:07:44 2014 +0200 Be a bit more tolerant when trying to detect if a desktop icon is to be removed (using regexp, not eq). --- debian/changelog | 3 +++ x2goserver/bin/x2goumount-session | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 72fd132..95865b5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium * 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. + - Be a bit more tolerant when trying to detect if a + desktop icon is to be removed (using regexp, not + eq). * debian/control: + Add D (x2goserver): libfile-which-perl. * x2goserver.spec: diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session index 94b2777..2d562eb 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\n" ) { + if ( @desktop_file_content[1] =~ m/$session\/ ) { 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
-
git-admin＠x2go.org