From 7b5baf641107cbe1df3a5d51c3f4f87e3d5f7432 Mon Sep 17 00:00:00 2001 From: Alberto Di Meglio Date: Mon, 24 Oct 2005 14:46:37 +0000 Subject: [PATCH] Fixed mysql_root_password scope --- org.glite.deployment.lb/config/scripts/glite-lb-config.py | 6 +++--- org.glite.deployment.lb/project/version.properties | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/org.glite.deployment.lb/config/scripts/glite-lb-config.py b/org.glite.deployment.lb/config/scripts/glite-lb-config.py index ff6ab42..78ce0cf 100644 --- a/org.glite.deployment.lb/config/scripts/glite-lb-config.py +++ b/org.glite.deployment.lb/config/scripts/glite-lb-config.py @@ -279,7 +279,7 @@ python %s-config [OPTION...]""" % (self.name, os.environ['GLITE_LOCATION'], \ print "\nCreate/Verify the %s database" % params['lb.database.name'] # Check if database exists - if self.mysql.existsDB(params['lb.database.name'],mysql_root_password) != 0: + if self.mysql.existsDB(params['lb.database.name'],self.mysql_root_password) != 0: # Create database print ('\n==> Creating MySQL %s database\n' % params['lb.database.name']) @@ -288,13 +288,13 @@ python %s-config [OPTION...]""" % (self.name, os.environ['GLITE_LOCATION'], \ file = open('/tmp/mysql_ct', 'w') - self.mysql.add_user(params['lb.database.name'],params['lb.database.username'],"",mysql_root_password) + self.mysql.add_user(params['lb.database.name'],params['lb.database.username'],"",self.mysql_root_password) text = ['USE %s;\n' % params['lb.database.name'], '\. %s/etc/glite-lb-dbsetup.sql\n' % os.environ['GLITE_LOCATION']] file.writelines(text) file.close() - os.system('/usr/bin/mysql -p%s < /tmp/mysql_ct' % mysql_root_password) + os.system('/usr/bin/mysql -p%s < /tmp/mysql_ct' % self.mysql_root_password) os.system('/bin/rm /tmp/mysql_ct') #Starting and stopping the database before the index creation diff --git a/org.glite.deployment.lb/project/version.properties b/org.glite.deployment.lb/project/version.properties index 6658ae7..a7d0971 100644 --- a/org.glite.deployment.lb/project/version.properties +++ b/org.glite.deployment.lb/project/version.properties @@ -1,4 +1,4 @@ -module.version = 2.0.4 +module.version = 2.0.5 module.age = 1 \ No newline at end of file -- 1.8.2.3