[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.0.99-2-263-g7a1fb51
X2Go dev team
git-admin at x2go.org
Fri Jan 3 20:50:56 CET 2014
The branch, build-baikal has been updated
via 7a1fb5126e83f8ba2a4e140f8a8c84ff6122f2cf (commit)
from 12caae569515ad64e779d5945d4d3eb11c960a30 (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 +
x2goserver/lib/x2gosqlitewrapper.pl | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 883e014..fda1a9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -58,6 +58,7 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low
* x2goserver.postinst: fix home path updates if new home path already exists
* Add real error message if client fails to resume/suspend/terminate
a session.
+ * SQLite DB backend: Fix typo in date format template.
[ Ivan Kabaivanov ]
* Makefile fix around man page installation in x2goserver-compat package.
diff --git a/x2goserver/lib/x2gosqlitewrapper.pl b/x2goserver/lib/x2gosqlitewrapper.pl
index 641cb9c..551cab1 100755
--- a/x2goserver/lib/x2gosqlitewrapper.pl
+++ b/x2goserver/lib/x2gosqlitewrapper.pl
@@ -280,9 +280,9 @@ elsif($cmd eq "listsessions_all")
{
my @strings;
my $sth=$dbh->prepare("select agent_pid, session_id, display, server, status,
- substr(strftime('%d.%m.%Y*%H:%M:%S',init_time),0,6)||substr(strftime('%d.%m.%Y*%H:%M:%S',init_time),9,11),
+ substr(strftime('%d.%m.%Y*%H:%M:%S',init_time),0,6)||substr(strftime('%d.%m.%Y*.%H:%M:%S',init_time),9,11),
cookie,client,gr_port,sound_port,
- substr(strftime('%d.%m.%Y*%H:%M:%S',last_time),0,6)||substr(strftime('%d.%m.%Y*%H:%M:%S',last_time),9,11),
+ substr(strftime('%d.%m.%Y*%H:%M:%S',last_time),0,6)||substr(strftime('%d.%m.%Y*.%H:%M:%S',last_time),9,11),
uname,
strftime('%s','now','localtime') - strftime('%s',init_time),fs_port from sessions
where status !='F' and uname=? and ( session_id not like '%XSHAD%') order by status desc");
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