Package: x2goserver Version: 3.2.0.0 Tags: patch -- Orion Poplawski Technical Manager 303-415-9701 x222 NWRA, Boulder Office FAX: 303-415-9702 3380 Mitchell Lane [email protected] Boulder, CO 80301 http://www.nwra.com
>From d2f4aadfe93f46ba95aead73ddfc9e61f3b6807e Mon Sep 17 00:00:00 2001 From: Orion Poplawski <[email protected]> Date: Thu, 13 Dec 2012 11:05:02 -0700 Subject: [PATCH] Use x2gopath in Server/DB perl modules --- X2Go/Server/DB.pm | 2 +- X2Go/Server/DB/PostgreSQL.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/X2Go/Server/DB.pm b/X2Go/Server/DB.pm index 45f1ec9..c9a83a1 100644 --- a/X2Go/Server/DB.pm +++ b/X2Go/Server/DB.pm @@ -44,7 +44,7 @@ setlogmask( LOG_UPTO(loglevel()) ); my ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwuid(getuid()); my $Config = new Config::Simple(syntax=>'ini'); -my $x2go_lib_path=`echo -n \$(x2gobasepath)/lib/x2go`; +my $x2go_lib_path=`x2gopath libexec`; $Config->read('/etc/x2go/x2gosql/sql' ) or die "Can't read config file /etc/x2go/x2gosql/sql"; my $backend=$Config->param("backend"); diff --git a/X2Go/Server/DB/PostgreSQL.pm b/X2Go/Server/DB/PostgreSQL.pm index 2400f60..72ba833 100644 --- a/X2Go/Server/DB/PostgreSQL.pm +++ b/X2Go/Server/DB/PostgreSQL.pm @@ -61,7 +61,7 @@ sub init_db if ( ! ( $dbuser and $dbpass ) ) { my $Config = new Config::Simple(syntax=>'ini'); - my $x2go_lib_path=`echo -n \$(x2gobasepath)/lib/x2go`; + my $x2go_lib_path=`x2gopath libexec`; $Config->read('/etc/x2go/x2gosql/sql' ) or die "Can't read config file /etc/x2go/x2gosql/sql"; my $backend=$Config->param("backend"); -- 1.8.0.2
_______________________________________________ X2Go-Dev mailing list [email protected] https://lists.berlios.de/mailman/listinfo/x2go-dev
