[X2Go-Commits] [x2goserver] 01/01: If x2golistmounts is used with out cmd options <session_id>, then the env var $X2GO_SESSION (current session) will be used.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch release/4.0.1.x
in repository x2goserver.

commit 50018d38ad4431b7c8cdc5289f584a9f3b3996a2
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Feb 27 14:32:46 2014 +0100

    If x2golistmounts is used with out cmd options <session_id>, then the env var $X2GO_SESSION (current session) will be used.
---
 debian/changelog              |    2 ++
 x2goserver/bin/x2golistmounts |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 43e13ea..84ac01b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ x2goserver (4.0.1.14-0x2go1) UNRELEASED; urgency=low
   * New upstream release (4.0.1.14):
     - Log SSHFS output and errors to ~/.x2go/C-<session>/sshfs-mounts.log.
       (Fixes: #415).
+    - If x2golistmounts is used with out cmd options <session_id>, then
+      the env var $X2GO_SESSION (current session) will be used.
   * x2goserver.spec:
     - Let builds for EPEL-7 behave like recent Fedora builds.
 
diff --git a/x2goserver/bin/x2golistmounts b/x2goserver/bin/x2golistmounts
index 2938d70..fa1b6c9 100755
--- a/x2goserver/bin/x2golistmounts
+++ b/x2goserver/bin/x2golistmounts
@@ -31,7 +31,7 @@ openlog($0,'cons,pid','user');
 setlogmask( LOG_UPTO(x2gologlevel()) );
 
 
-my $session_id=shift or die;
+my $session_id=shift || $ENV{'X2GO_SESSION'} or die;
 
 my $mounts = join("\n", db_getmounts($session_id));
 print "$mounts\n";

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git