The branch, master has been updated via 88389bf045c33d96260ce5b1c6af92ff5d858e8f (commit) from 03afe809d558b5aa87205e09b28b85ca3ff1dc26 (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 88389bf045c33d96260ce5b1c6af92ff5d858e8f Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Nov 30 08:39:42 2012 +0100 Fix mounting of multiple paths, thanks to Pascal Vibet. (Closes upstream issue #67). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2goserver/bin/x2gomountdirs | 11 ++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 6a2246e..03e44ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -44,6 +44,8 @@ x2goserver (3.1.1.10-0~x2go1) UNRELEASED; urgency=low * New upstream version (3.1.1.10): - Adapt Xinerama path in x2gopath: use $base for detecting the path to the Xinerama libs, as well, as is done with all the other paths. + - Fix mounting of multiple paths, thanks to Pascal Vibet. (Closes upstream + issue #67). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 23 Nov 2012 15:35:48 +0100 diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index b008d1c..b9f9431 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -200,6 +200,7 @@ for (my $i=0;$i<@dirs;$i++) my $printspool=0; my $mimeboxspool=0; my $mntpath; + my $this_mdir = $mdir; if(@dirs[$i]=~m/__PRINT_SPOOL_/) { @dirs[$i]=~s/__PRINT_SPOOL_//; @@ -222,24 +223,24 @@ for (my $i=0;$i<@dirs;$i++) $p=~s/\/ramdrive\/mnt\///; if ($p =~ m/CDROM/) { - $mdir=$mdir."/cd"; + $this_mdir=$this_mdir."/cd"; } else { - $mdir=$mdir."/rm"; + $this_mdir=$this_mdir."/rm"; } } else { - $mdir=$mdir."/disk"; + $this_mdir=$this_mdir."/disk"; } $p=~s/\//_/g; $p=~s/ /_/g; $p=~s/~_cygdrive_//; $p=~s/~_windrive_//; $p=~s/~//g; - mkdir("$mdir/$p"); - $mntpath="$mdir/$p"; + mkdir("$this_mdir/$p"); + $mntpath="$this_mdir/$p"; } if (db_insertmount( $session, $mntpath, $host)) 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).