The branch, release/4.0.1.x has been updated via 66574504720a2b2b4c3e096ef92945a676515e23 (commit) from 66f150790fc68cc50eade2e070876d04adf2e851 (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 | 7 +++++++ x2goserver/bin/x2gomountdirs | 3 +-- 2 files changed, 8 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 0cae7bf..05d0209 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +x2goserver (3.1.1.6-0~x2go1) UNRELEASED; urgency=low + + * Bugfix release (3.1.1.6): + - Fix for non-well-tested x2gomountdirs script. + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 07 Nov 2012 20:54:34 +0100 + x2goserver (3.1.1.5-0~x2go1) unstable; urgency=low [ Stéphane Graber ] diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index 8d18b92..457a1d3 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -34,7 +34,7 @@ setlogmask( LOG_UPTO(x2gologlevel()) ); syslog('info', "x2gomountdirs has been called with options: @ARGV"); -sub source { +sub source_environment { my $name = shift; open my $fh, "<", $name @@ -48,7 +48,6 @@ sub source { next; } my ($k, $v) = split /=/, $line, 2; - if ( $v =~ s/^(['"])(.*)\1/$2/; #' fix highlighter $v =~ s/\$([a-zA-Z]\w*)/$ENV{$1}/g; $v =~ s/`(.*?)`/`$1`/ge; #dangerous 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).