This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.0.x in repository x2goserver. commit 0cfdbcf2071be85c3168d554b9c35bb02cf0862f Author: Oleksandr Shneyder <o.schneyder@phoca-gmbh.de> Date: Fri Feb 21 14:41:06 2014 +0100 Fix datetime output format in x2godbwrapper.pm. --- debian/changelog | 5 +++++ x2goserver/lib/x2godbwrapper.pm | 16 ++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7e26bee..1c4ed86 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ x2goserver (4.0.0.12-0x2go1) UNRELEASED; urgency=low + [ Mike Gabriel ] * Adopt this patch from stable release branch and apply to LTS branch: - Start/resume rootless sessions without geometry parameter. Esp. using X2GO_GEOMETRY=fullscreen for rootless sessions lead to an extra 1x1 px @@ -9,6 +10,10 @@ x2goserver (4.0.0.12-0x2go1) UNRELEASED; urgency=low we broke by trying to fix the fullscreen/geometry issue in x2gostartagent. Thanks to Harvey Eneman for tracking this down!!! + [ Oleksandr Shneyder ] + * New upstream version (4.0.0.12): + - Fix datetime output format in x2godbwrapper.pm. + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 21 Feb 2014 14:25:43 +0100 x2goserver (4.0.0.11-0x2go1) unstable; urgency=low diff --git a/x2goserver/lib/x2godbwrapper.pm b/x2goserver/lib/x2godbwrapper.pm index acc65c8..857167f 100644 --- a/x2goserver/lib/x2godbwrapper.pm +++ b/x2goserver/lib/x2godbwrapper.pm @@ -138,8 +138,8 @@ sub dbsys_listsessionsroot "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, - to_char(init_time,'YYYY-MM-DDTHH24:MI:SS'),cookie,client,gr_port, - sound_port,to_char(last_time,'YYYY-MM-DDTHH24:MI:SS'),uname, + to_char(init_time,'YYYY-MM-DD\"T\"HH24:MI:SS'),cookie,client,gr_port, + sound_port,to_char(last_time,'YYYY-MM-DD\"T\"HH24:MI:SS'),uname, to_char(now()-init_time,'SSSS'),fs_port from sessions where server='$server' order by status desc"); $sth->execute()or die; @@ -166,8 +166,8 @@ sub dbsys_listsessionsroot_all my @strings; my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, - to_char(init_time,'YYYY-MM-DDTHH24:MI:SS'),cookie,client,gr_port, - sound_port,to_char(last_time,'YYYY-MM-DDTHH24:MI:SS'),uname, + to_char(init_time,'YYYY-MM-DD\"T\"HH24:MI:SS'),cookie,client,gr_port, + sound_port,to_char(last_time,'YYYY-MM-DD\"T\"HH24:MI:SS'),uname, to_char(now()-init_time,'SSSS'),fs_port from sessions order by status desc"); $sth->execute()or die; @@ -624,8 +624,8 @@ sub db_listsessions my @strings; my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, - to_char(init_time,'YYYY-MM-DDTHH24:MI:SS'), cookie, client, gr_port, - sound_port, to_char( last_time, 'YYYY-MM-DDTHH24:MI:SS'), uname, + to_char(init_time,'YYYY-MM-DD\"T\"HH24:MI:SS'), cookie, client, gr_port, + sound_port, to_char( last_time, 'YYYY-MM-DD\"T\"HH24:MI:SS'), uname, to_char(now()- init_time,'SSSS'), fs_port from sessions_view where status !='F' and server='$server' and (session_id not like '%XSHAD%') order by status desc"); @@ -653,8 +653,8 @@ sub db_listsessions_all my @strings; my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, - to_char(init_time,'YYYY-MM-DDTHH24:MI:SS'), cookie, client, gr_port, - sound_port, to_char( last_time, 'YYYY-MM-DDTHH24:MI:SS'), uname, + to_char(init_time,'YYYY-MM-DD\"T\"HH24:MI:SS'), cookie, client, gr_port, + sound_port, to_char( last_time, 'YYYY-MM-DD\"T\"HH24:MI:SS'), uname, to_char(now()- init_time,'SSSS'), fs_port from sessions_view where status !='F' and (session_id not like '%XSHAD%') order by status desc"); -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git