From unknown Wed Apr 29 13:26:04 2026 X-Loop: git-admin@x2go.org Subject: Bug#86: Use x2gopath in Server/DB perl modules Reply-To: Orion Poplawski , 86@bugs.x2go.org Resent-From: Orion Poplawski Resent-To: x2go-dev@lists.berlios.de Resent-CC: X2Go Developers X-Loop: git-admin@x2go.org Resent-Date: Fri, 14 Dec 2012 16:03:02 +0000 Resent-Message-ID: Resent-Sender: git-admin@x2go.org X-X2Go-PR-Message: report 86 X-X2Go-PR-Package: x2goserver X-X2Go-PR-Keywords: patch Received: via spool by submit@bugs.x2go.org id=B.13555007609991 (code B); Fri, 14 Dec 2012 16:03:02 +0000 Received: (at submit) by bugs.x2go.org; 14 Dec 2012 15:59:20 +0000 Received: from mail.cora.nwra.com (mercury.cora.nwra.com [4.28.99.165]) by ymir (Postfix) with ESMTPS id 3F7895DA6C for ; Fri, 14 Dec 2012 16:59:20 +0100 (CET) Received: from barry.cora.nwra.com (barry.cora.nwra.com [10.10.20.7]) (authenticated bits=0) by mail.cora.nwra.com (8.14.4/8.14.4) with ESMTP id qBEFxHu5032034 (version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO) for ; Fri, 14 Dec 2012 08:59:18 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=cora.nwra.com; s=default; t=1355500758; bh=+bJ3OMjnO+q1Y2THd1fPNkqLw/rwibfI/uJfYSJlvA4=; h=Message-ID:Date:From:MIME-Version:To:Subject:Content-Type; b=br9stLSoJfsz3EX/ajBamijjE1TnWAlK5pcgafJWv5QsXKXX3WHWZ1gN7fozN/Cs9 T/PbIoYFcdzvMAhbyhZSWBPrvCrAg9cewu7VmFal0hVLVfBAw6IeYzd2F6G3Dd/2GX almSRepam48Wc94kRqCkytaRTrC4ZK0qKCNcvj0w= Message-ID: <50CB4CD5.80204@cora.nwra.com> Date: Fri, 14 Dec 2012 08:59:17 -0700 From: Orion Poplawski User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: submit@bugs.x2go.org Content-Type: multipart/mixed; boundary="------------060008010106070409040207" This is a multi-part message in MIME format. --------------060008010106070409040207 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit 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 orion@nwra.com Boulder, CO 80301 http://www.nwra.com --------------060008010106070409040207 Content-Type: text/x-patch; name="0001-Use-x2gopath-in-Server-DB-perl-modules.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-Use-x2gopath-in-Server-DB-perl-modules.patch" >From d2f4aadfe93f46ba95aead73ddfc9e61f3b6807e Mon Sep 17 00:00:00 2001 From: Orion Poplawski 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 --------------060008010106070409040207--