[X2go-Commits] x2goserver.git - backport-lenny (branch) updated: 3.1.0.1-38-g3dc9e52

[X2Go dev team]

The branch, backport-lenny has been updated
       via  3dc9e5248033a4964e515523bd1d82fdf1146dd2 (commit)
      from  07ee9414f510fabebe64b2bc825090f49fec80e9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3dc9e5248033a4964e515523bd1d82fdf1146dd2
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Mar 17 17:09:20 2012 +0100

    No DBI method sqlite_busy_timeout available on Debian lenny.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                    |    1 +
 x2goserver/lib/x2gosqlitewrapper.pl |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 94f21fd..2e7c0f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ x2goserver (3.1.1.0-0~x2go+bpo+lenny1) UNRELEASED; urgency=low
 
   * Backport current status of x2goserver (unreleased 3.1.1.0) to
     Debian lenny.
+  * No DBI method sqlite_busy_timeout available on Debian lenny.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 01 Feb 2012 13:40:31 +0100
 
diff --git a/x2goserver/lib/x2gosqlitewrapper.pl b/x2goserver/lib/x2gosqlitewrapper.pl
index ba2c02d..94e4785 100755
--- a/x2goserver/lib/x2gosqlitewrapper.pl
+++ b/x2goserver/lib/x2gosqlitewrapper.pl
@@ -64,7 +64,7 @@ my ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expi
 my $realuser=$uname;
 
 my $dbh=DBI->connect("dbi:SQLite:dbname=$dbfile","","",{sqlite_use_immediate_transaction => 1, AutoCommit => 1, }) or die $_;
-$dbh->sqlite_busy_timeout( 2000 );
+#$dbh->sqlite_busy_timeout( 2000 );
 
 my $cmd=shift or die "command not specified";
 my $rc=0;


hooks/post-receive
-- 
x2goserver.git (X2Go Server)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goserver.git" (X2Go Server).