This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch feature/mysql-backend in repository x2goserver. from 2bc9475 x2goserver/sbin/x2godbadmin: split out subroutines into main namespace, call them generically with correct parameters from specialized namespace. new 29f722b x2goserver/sbin/x2godbadmin: remove potentially confusing whitespace. new 40787aa x2goserver/sbin/x2godbadmin: fix up other try blocks; whitespace only. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 2 ++ x2goserver/sbin/x2godbadmin | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/mysql-backend in repository x2goserver. commit 40787aa939cbb72d26b261574a36071eef71e3b4 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Feb 23 23:52:11 2018 +0100 x2goserver/sbin/x2godbadmin: fix up other try blocks; whitespace only. --- debian/changelog | 1 + x2goserver/sbin/x2godbadmin | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index fd4d989..0c99f9f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -80,6 +80,7 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium call them generically with correct parameters from specialized namespace. - x2goserver/sbin/x2godbadmin: remove potentially confusing whitespace. + - x2goserver/sbin/x2godbadmin: fix up other try blocks; whitespace only. * debian/{control,compat}: + Bump DH compat level to 9. * debian/: diff --git a/x2goserver/sbin/x2godbadmin b/x2goserver/sbin/x2godbadmin index 2ce95ce..4332738 100755 --- a/x2goserver/sbin/x2godbadmin +++ b/x2goserver/sbin/x2godbadmin @@ -281,7 +281,8 @@ if ($Config->param("backend") eq 'postgres') my $sth_tekictrl; my $sth_tekidata; my $sth_update; - try { + try + { $sth_tekictrl = $dbh->prepare("select tekictrl_port from sessions"); $sth_tekictrl->execute(); } @@ -296,7 +297,8 @@ if ($Config->param("backend") eq 'postgres') $sth_tekictrl->finish(); $update_views_n_rules = 1; }; - try { + try + { $sth_tekidata = $dbh->prepare("select tekidata_port from sessions"); $sth_tekidata->execute(); } -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/mysql-backend in repository x2goserver. commit 29f722b7e235edf1bb11786d459bb9f473a4c9fd Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Feb 23 23:50:32 2018 +0100 x2goserver/sbin/x2godbadmin: remove potentially confusing whitespace. --- debian/changelog | 1 + x2goserver/sbin/x2godbadmin | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b6925f4..fd4d989 100644 --- a/debian/changelog +++ b/debian/changelog @@ -79,6 +79,7 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium - x2goserver/sbin/x2godbadmin: split out subroutines into main namespace, call them generically with correct parameters from specialized namespace. + - x2goserver/sbin/x2godbadmin: remove potentially confusing whitespace. * debian/{control,compat}: + Bump DH compat level to 9. * debian/: diff --git a/x2goserver/sbin/x2godbadmin b/x2goserver/sbin/x2godbadmin index 34209a9..2ce95ce 100755 --- a/x2goserver/sbin/x2godbadmin +++ b/x2goserver/sbin/x2godbadmin @@ -258,7 +258,7 @@ if ($Config->param("backend") eq 'postgres') $dbadmin='postgres'; } - open (FL,"< /etc/x2go/x2gosql/passwords/pgadmin ") or die "Can't read password file /etc/x2go/x2gosql/passwords/pgadmin"; + open (FL,"< /etc/x2go/x2gosql/passwords/pgadmin") or die "Can't read password file /etc/x2go/x2gosql/passwords/pgadmin"; my $dbadminpass=<FL>; close(FL); chomp($dbadminpass); @@ -662,7 +662,7 @@ sub pg_create_database $sth=$dbh->prepare("create USER $x2goadmin WITH ENCRYPTED PASSWORD '$x2goadminpass'"); $sth->execute() or die; #save x2goadmin password - open (FL,"> /etc/x2go/x2gosql/passwords/x2gopgadmin ") or die "Can't write password file /etc/x2go/x2gosql/passwords/x2gopgadmin"; + open (FL,"> /etc/x2go/x2gosql/passwords/x2gopgadmin") or die "Can't write password file /etc/x2go/x2gosql/passwords/x2gopgadmin"; print FL $x2goadminpass; close(FL); $sth->finish(); -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org