[X2Go-Commits] [x2goserver] 01/01: Fix x2gormforward for 4.0.1.x release series (the X2Go::Log Perl module only exists in X2Go Server >= 4.1.0.0, the 4.0.1.x release series has to use x2gologlevel.pm in `x2gopath lib`. (Fixes: #617).

git-admin at x2go.org git-admin at x2go.org
Tue Sep 23 10:02:18 CEST 2014


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 bd7c549b85302c715b4cf165e59cf7ee6810e4fa
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Sep 23 09:59:52 2014 +0200

    Fix x2gormforward for 4.0.1.x release series (the X2Go::Log Perl module only exists in X2Go Server >= 4.1.0.0, the 4.0.1.x release series has to use x2gologlevel.pm in `x2gopath lib`. (Fixes: #617).
---
 debian/changelog             |    3 +++
 x2goserver/lib/x2gormforward |    5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7f194d3..3bf8a12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -88,6 +88,9 @@ x2goserver (4.0.1.16-0x2go1) UNRELEASED; urgency=low
       be found. This can happen during session startups. Report to system log
       instead.
     - Don't use Perl package File::ReadBackwards anymore.
+    - Fix x2gormforward for 4.0.1.x release series (the X2Go::Log Perl module
+      only exists in X2Go Server >= 4.1.0.0, the 4.0.1.x release series has to
+      use x2gologlevel.pm in `x2gopath lib`. (Fixes: #617).
   * debian/control, x2goserver.spec:
     + Update versioned D: x2goagent (>= 3.5.0.25). This assures that X2Go
       works with poly-instantiated /tmp directories.
diff --git a/x2goserver/lib/x2gormforward b/x2goserver/lib/x2gormforward
index b15e38f..a6e8fe1 100755
--- a/x2goserver/lib/x2gormforward
+++ b/x2goserver/lib/x2gormforward
@@ -23,10 +23,11 @@
 use strict;
 use Sys::Syslog qw( :standard :macros );
 
-use X2Go::Log qw(loglevel);
+use lib `x2gopath lib`;
+use x2gologlevel;
 
 openlog($0,'cons,pid','user');
-setlogmask( LOG_UPTO(loglevel()) );
+setlogmask( LOG_UPTO(x2gologlevel()) );
 
 my $session=shift or die;
 

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


More information about the x2go-commits mailing list