[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.1.1.4-14-g07524db

X2Go dev team git-admin at x2go.org
Wed Dec 4 06:22:15 CET 2013


The branch, build-baikal has been updated
       via  07524db03a6c42a54941a03be6637b0ded80a448 (commit)
      from  de0ef239a7408fd7299f2ea599da91f975f3ffad (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:
 x2goserver/bin/x2gomountdirs      |    8 +++++++-
 x2goserver/bin/x2goumount-session |    7 ++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs
index bd556d7..8d18b92 100755
--- a/x2goserver/bin/x2gomountdirs
+++ b/x2goserver/bin/x2gomountdirs
@@ -42,7 +42,13 @@ sub source {
 
     while (<$fh>) {
         chomp;
-        my ($k, $v) = split /=/, $_, 2;
+        my $line = $_;
+        if ( $line =~ m/^#.*/ )
+        {
+            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
diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session
index b12da34..ca52174 100755
--- a/x2goserver/bin/x2goumount-session
+++ b/x2goserver/bin/x2goumount-session
@@ -45,7 +45,12 @@ sub source_environment {
 
     while (<$fh>) {
         chomp;
-        my ($k, $v) = split /=/, $_, 2;
+        my $line = $_;
+        if ( $line =~ m/^#.*/ )
+        {
+            next;
+        }
+        my ($k, $v) = split /=/, $line, 2;
         $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).




More information about the x2go-commits mailing list