[X2Go-Commits] [x2goserver] 02/02: x2goserver/sbin/x2godbadmin: use global variable instead of hardcoded string (since the global variable is used latter on anyway).

[git-admin at x2go.org]

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 a4f7c88b32273d4414522800a70565a9a6c76f20
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Feb 22 05:07:06 2018 +0100

    x2goserver/sbin/x2godbadmin: use global variable instead of hardcoded string (since the global variable is used latter on anyway).
---
 debian/changelog            | 2 ++
 x2goserver/sbin/x2godbadmin | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 3597721..ac0b2ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -60,6 +60,8 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium
       ${PREFIX}/lib/. File should not be modified by users.
     - x2goserver-common/: move etc/tmpfiles.d to lib/tmpfiles.d.
     - x2goserver/sbin/x2godbadmin: whitespace only.
+    - x2goserver/sbin/x2godbadmin: use global variable instead of hardcoded
+      string (since the global variable is used latter on anyway).
   * debian/{control,compat}:
     + Bump DH compat level to 9.
   * debian/:
diff --git a/x2goserver/sbin/x2godbadmin b/x2goserver/sbin/x2godbadmin
index 9e5d3c2..4eab3e9 100755
--- a/x2goserver/sbin/x2godbadmin
+++ b/x2goserver/sbin/x2godbadmin
@@ -708,7 +708,7 @@ sub create_database
 {
 	my $dbh=DBI->connect("dbi:Pg:dbname=postgres;host=$host;port=$port;sslmode=$sslmode", "$dbadmin", "$dbadminpass",{AutoCommit => 1}) or die $_;
 	#drop db if exists
-	my $sth=$dbh->prepare("drop database if exists x2go_sessions");
+	my $sth=$dbh->prepare("drop database if exists $db");
 	$sth->execute();
 	#drop x2goadmin
 	$sth=$dbh->prepare("drop user if exists $x2goadmin");

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git