[X2go-Commits] x2goserver.git - master (branch) updated: 3.0.99.10-5-g8ac7d89

[X2go dev team]

The branch, master has been updated
       via  8ac7d8934719d90fcd35769836c02c3e3a54f85b (commit)
       via  9c621a42b9143d9cfa7f481d3b909693fc6564b2 (commit)
      from  414d6c5d3fc471d5ede367620801d9268bb5c372 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8ac7d8934719d90fcd35769836c02c3e3a54f85b
Author: Milan Knížek <knizek.confy at gmail.com>
Date:   Sat Feb 11 01:22:48 2012 +0100

    Fix removal of desktop link on x2goumount-session if local folder of a Windows client gets unmounted.

commit 9c621a42b9143d9cfa7f481d3b909693fc6564b2
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Feb 10 23:49:30 2012 +0100

    whitespace cleanup

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                  |    5 +++++
 x2goserver/bin/x2goumount-session |    6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 5084adf..7c7c7e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,11 @@ x2goserver (3.1.0.0-0~x2go1) UNRELEASED; urgency=low
     - run netstat -tl --all to find free ports for graphic, sound and sshfs
       tunnels in x2gostartagent and x2goresume-session
 
+  [ Milan Knížek ]
+  * New upstream version (3.1.0.0)
+    - Fix removal of desktop link on x2goumount-session if local folder of a
+      Windows client gets unmounted.
+
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 01 Feb 2012 13:45:00 +0100
 
 x2goserver (3.0.99.10-0~x2go1) unstable; urgency=low
diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session
index 46befc8..bc163fa 100755
--- a/x2goserver/bin/x2goumount-session
+++ b/x2goserver/bin/x2goumount-session
@@ -44,7 +44,7 @@ if ($only_path)
 	$only_path=~s/\/ramdrive\/mnt\///;
 	$only_path=~ s/\//_/g;
 	
-	### FIXME: handle CDROM and Removable Media mounts here, as well!!!	
+	### FIXME: handle CDROM and Removable Media mounts here, as well!!!
 
 	$only_path="/tmp/$ENV{'USER'}_media/disk/$only_path";
 	#                                   ^^^^
@@ -75,7 +75,7 @@ for ($i=0;$i<@outp;$i++)
 	@outp[$i]=~s/ //g;
 	chomp(@outp[$i]);
 	chomp(@outp[$i]);
-	chomp(@outp[$i]);    
+	chomp(@outp[$i]);
 	my @line=split('\|',"@outp[$i]");
 	my $path="@line[0]:@line[1]";
 	if ($only_path)
@@ -123,6 +123,8 @@ break:
 	}
 	if (! $found)
 	{
+
+		$remote=~s/\/cygdrive\///g;
 		$remote=~s/\//_/g;
 		$remote=(split(":","$remote"))[1];
 		$remote="$ENV{'HOME'}/Desktop/$remote";


hooks/post-receive
-- 
x2goserver.git (X2Go Server)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goserver.git" (X2Go Server).