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 1cc93d59f6bb2559b1c42daba26cf3b9b50f3e69 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Feb 4 23:25:48 2016 +0100 x2goserver/bin/x2gocleansessions: replace system_capture_stdout_output() with actual implementation. We don't have that function on the release branch. --- debian/changelog | 3 +++ x2goserver/sbin/x2gocleansessions | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f87c694..3a7fadf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -69,6 +69,9 @@ x2goserver (4.0.1.20-0x2go1) UNRELEASED; urgency=low initialization. If IP-based initialization was requested but the default outgoing IP address unavailable, fall back to randomization. - x2goserver/bin/x2goruncommand: whitespace and comment changes only. + - x2goserver/bin/x2gocleansessions: replace system_capture_stdout_output() + with actual implementation. We don't have that function on the release + branch. * x2goserver.spec: - Add sudo and logcheck as BuildRequires and Requires. Don't own directories that are owned by sudo and logcheck. Logcheck is not diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index 68b7e8e..00cb43e 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -25,6 +25,7 @@ use Sys::Hostname; use Sys::Syslog qw( :standard :macros ); use POSIX; +use Capture::Tiny qw ( :all ); my $x2go_lib_path=`x2gopath libexec`; use lib `x2gopath lib`; @@ -194,7 +195,7 @@ elsif ($pid == 0 ) } # Update current status once per session. Avoids race conditions. - my $current_status = system_capture_stdout_output ("$x2go_lib_path/x2gogetstatus", "@sinfo[1]"); + my ($current_status, undef, undef) = capture { system ("$x2go_lib_path/x2gogetstatus", "@sinfo[1]"); }; if (length ($current_status)) { if (@sinfo[4] ne $current_status) { syslog ('debug', "@sinfo[1]: updating session status from '@sinfo[4]' to '$current_status'."); -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git