[X2Go-Commits] x2goserver.git - release/4.0.1.x (branch) updated: 3.1.0.1-27-g83df64a
X2Go dev team
git-admin at x2go.org
Thu Jun 6 13:35:20 CEST 2013
The branch, release/4.0.1.x has been updated
via 83df64accdfbae7225d3894b49b6c0cde3124847 (commit)
from 239588d6ced18485c821c81ce305d9c8d2a2eb2f (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/sbin/x2gocleansessions | 4 ++--
x2goserver/sbin/x2golistsessions_root | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 16d20f3..0a72d8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ x2goserver (3.1.1.0-0~x2go1) UNRELEASED; urgency=low
resuming process.
- Add X2Go server script x2gogetstatus.
- Add/enable debugging of x2gocleansessions.
+ - Silence error messages if the agent's session.log file is not accessible
+ (e.g. on NFSv4+Krb5-mounted homes).
* Remove /etc/x2go/applications on package removal if it is a
symlink, keep it, if it is a directory. Remove /etc/x2go
(if empty after purge) on package purge.
diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions
index c56e720..6e21482 100755
--- a/x2goserver/sbin/x2gocleansessions
+++ b/x2goserver/sbin/x2gocleansessions
@@ -56,12 +56,12 @@ sub check_stat
my $sess=shift;
my $user=shift;
my $log="~$user/.x2go/C-$sess/session.log";
- my $text=`tail -1 $log`;
+ my $text=`tail -1 $log 2>/dev/null`;
if ($text =~ m/Session suspended/)
{
return 0;
}
- return 1;
+ return 1;
}
sub catch_term
diff --git a/x2goserver/sbin/x2golistsessions_root b/x2goserver/sbin/x2golistsessions_root
index c1f0567..dddcae3 100755
--- a/x2goserver/sbin/x2golistsessions_root
+++ b/x2goserver/sbin/x2golistsessions_root
@@ -35,7 +35,7 @@ sub check_stat
my $sess=shift;
my $user=shift;
my $log="~$user/.x2go/C-$sess/session.log";
- my $text=`tail -1 $log`;
+ my $text=`tail -1 $log 2>/dev/null`;
if ($text =~ m/Session suspended/)
{
return 0;
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