[X2Go-Commits] x2goserver.git - build-main (branch) updated: 3.1.1.0-3-g3d7ab5e

[X2Go dev team]

The branch, build-main has been updated
       via  3d7ab5ee559139653ad299bdb6779c313f3861cc (commit)
      from  5fc633c06d3c39bf77c95afde55ed3c6236cde0c (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                  |    1 +
 x2goserver/bin/x2gomountdirs      |    1 +
 x2goserver/bin/x2goumount-session |    6 +++++-
 3 files changed, 7 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index ea139c5..7297dcb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ x2goserver (3.1.1.1-0~x2go1) UNRELEASED; urgency=low
   [ Mike Gabriel ]
   * New upstream version (3.1.1.1):
     - Add/fix Python X2Go folder sharing/unsharing support from Windows.
+    - Handle whitespace in folder names appropriately.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 04 Apr 2012 11:44:14 +0200
 
diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs
index 77ac985..88948e3 100755
--- a/x2goserver/bin/x2gomountdirs
+++ b/x2goserver/bin/x2gomountdirs
@@ -286,6 +286,7 @@ for (my $i=0;$i<@dirs;$i++)
 				my $p=@dirs[$i];
 				$p=~s/\/cygdrive\///;
 				$p=~s/\/windrive\///;
+				$p=~s/ /_/g;
 				$p=~s/\//_/g;
 				$fname="$fname/$p";
 				if ("$current_desktop" ne "NONE")
diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session
index db99392..f79a733 100755
--- a/x2goserver/bin/x2goumount-session
+++ b/x2goserver/bin/x2goumount-session
@@ -52,7 +52,9 @@ if ($only_path)
 	$only_path=~ s/^([a-zA-Z]:)/_cygdrive_\1/;
 	$only_path=~ s/://;
 	$only_path=~ s/\\/_/g;
-	
+	$only_path=~ s/ /_/g;
+	$only_path=~ s/\\040/_/g;
+
 	### FIXME: handle CDROM and Removable Media mounts here, as well!!!
 
 	$only_path="$tmp_dir/$ENV{'USER'}_media/disk/$only_path";
@@ -147,6 +149,8 @@ break:
 		$remote=~s/\/cygdrive\///;
 		$remote=~s/\/windrive\///;
 		$remote=~s/\//_/g;
+		$remote=~s/ /_/g;
+		$remote=~s/\\040/_/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).