[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.1.1.3-58-g539006b

X2Go dev team git-admin at x2go.org
Fri Jan 3 20:51:33 CET 2014


The branch, build-baikal has been updated
       via  539006bf0a1b87dd6ac75379f3006155974580ae (commit)
      from  b55d2e2d9f29e215dd86b5a2dc4f0e2b8e0e5aef (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                   |    1 +
 .../lib/libx2go-server-db-sqlite3-wrapper.pl       |   10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index d4b91ec..95c7108 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,7 @@ x2goserver (3.2.0.0-0~x2go1) UNRELEASED; urgency=low
     - Only extend LD_LIBRARY_PATH by Xrandr extension for KDE. Breaks GNOME.
     - Install /etc/x2go/x2go_logout with its directory x2go_logout.d via
       Makefile installation.
+    - Fix new SQLite3 wrapper for db_getmounts Perl call.
   * /debian/control:
     + Maintainer change in package: X2Go Developers <x2go-dev at lists.berlios.de>.
     + Depend on nx-libs (>=3.5.0.15-0~) which has the Xrandr symlinks folder.
diff --git a/libx2go-server-db-perl/lib/libx2go-server-db-sqlite3-wrapper.pl b/libx2go-server-db-perl/lib/libx2go-server-db-sqlite3-wrapper.pl
index a1e5578..df5d18f 100755
--- a/libx2go-server-db-perl/lib/libx2go-server-db-sqlite3-wrapper.pl
+++ b/libx2go-server-db-perl/lib/libx2go-server-db-sqlite3-wrapper.pl
@@ -43,7 +43,7 @@ sub print_result
 
 sub print_result_list
 {
-	while ( shift )
+	foreach ( shift )
 	{
 		print @_, "\n";
 	}
@@ -56,10 +56,10 @@ my $cmd=shift or die "command not specified";
 # call the corresponding function in the X2Go::Server:DB:SQLite3 package
 switch ($cmd)
 {
-	case /.*list.*root/ { @result_list = eval("X2Go::Server::DB::SQLite3::dbsys_$cmd(\@ARGV)") }
-	case /.*list.*/	    { @result_list = eval("X2Go::Server::DB::SQLite3::db_$cmd(\@ARGV)") }
-	case /.*root/       { $result = eval("X2Go::Server::DB::SQLite3::dbsys_$cmd(\@ARGV)") }
-	else                { $result = eval("X2Go::Server::DB::SQLite3::db_$cmd(\@ARGV)") } 
+	case /.*listsessions.*root/              { @result_list = eval("X2Go::Server::DB::SQLite3::dbsys_$cmd(\@ARGV)") }
+	case /.*(listsessions|getmounts).*/      { @result_list = eval("X2Go::Server::DB::SQLite3::db_$cmd(\@ARGV)") }
+	case /.*root/                            { $result = eval("X2Go::Server::DB::SQLite3::dbsys_$cmd(\@ARGV)") }
+	else                                     { $result = eval("X2Go::Server::DB::SQLite3::db_$cmd(\@ARGV)") }
 }
 
 if ( defined(@result_list) )


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).




More information about the x2go-commits mailing list