The branch, release/4.0.1.x has been updated via 5a0b2cacaf99cefe524fd398b072aecb0710bbd7 (commit) from 8292c49e91d6ab71826715e89ee09261e4acf670 (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 | 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 6180211..b703359 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,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 8436219..5ebf101 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -221,6 +221,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_//; @@ -243,24 +244,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).