[X2Go-Commits] [x2goserver] 01/02: 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
git-admin at x2go.org
Fri Feb 28 13:13:27 CET 2014
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goserver.
commit c4dbc5c407da2bc6fb2169be1441e8b162dcaffd
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 46128c2..03e71f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -102,6 +102,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 56d3f5f..c05ae2c 100755
--- a/x2goserver/bin/x2golistmounts
+++ b/x2goserver/bin/x2golistmounts
@@ -29,7 +29,7 @@ use X2Go::Log qw(loglevel);
openlog($0,'cons,pid','user');
setlogmask( LOG_UPTO(loglevel()) );
-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
More information about the x2go-commits
mailing list