This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from bbad5d6 general: update copyright notices, whitespace fixes. Happy new year! new f3f12d1 Handle execution of ss command from Perl script x2golistdesktops in a way that not only works on Debian, but also on Fedora et al. (Fixes: #727). The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 2 ++ x2goserver/bin/x2golistdesktops | 8 ++++++++ 2 files changed, 10 insertions(+) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit f3f12d1819358956e7d2d6f89f1b4b204cce3e80 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Jan 8 23:26:22 2015 +0100 Handle execution of ss command from Perl script x2golistdesktops in a way that not only works on Debian, but also on Fedora et al. (Fixes: #727). --- debian/changelog | 2 ++ x2goserver/bin/x2golistdesktops | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index 1e80d95..f4b223b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -205,6 +205,8 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium mountpoints erroneously registered sshfs mountpoints if sshfs command times out. Furthermore, print errors to STDERR (not STDOUT). (Fixes: #405). + - Handle execution of ss command from Perl script x2golistdesktops in a way + that not only works on Debian, but also on Fedora et al. (Fixes: #727). * debian/control: + Add D (x2goserver): libfile-which-perl. + Add C (x2goserver: x2godesktopsharing (<< 3.1.1.2). diff --git a/x2goserver/bin/x2golistdesktops b/x2goserver/bin/x2golistdesktops index 7bbb8f9..386ed17 100755 --- a/x2goserver/bin/x2golistdesktops +++ b/x2goserver/bin/x2golistdesktops @@ -61,7 +61,15 @@ my $rdisp=join("I",@rdisplays); $rdisp="I${rdisp}I"; my $uname=$ENV{'USER'}; + +# on Debian the ss command is in /usr/bin, on Fedora, it is in /usr/sbin... +# -> so we need to tweak the PATH env var a little here... +my $old_PATH=$ENV{'PATH'}; +$ENV{'PATH'}="$ENV{'PATH'}:/usr/sbin:/sbin"; my $lines=system_capture_stdout_output("ss", "-lxu"); +$ENV{'PATH'}=$old_PATH; +undef $old_PATH; + my @lines=split("\n", "$lines"); my @outp = grep ( /(@| )\/tmp\/.X11-unix\/X.*/, @lines); -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org