Revision: 51315
Author: kim
Date: 2009-06-01 22:10:38 +0000 (Mon, 01 Jun 2009)
Log Message:
-----------
minor tpyo
Modified Paths:
--------------
trunk/testing/installer/installation_system.py
Modified: trunk/testing/installer/installation_system.py
===================================================================
--- trunk/testing/installer/installation_system.py 2009-06-01 22:00:28 UTC
(rev 51314)
+++ trunk/testing/installer/installation_system.py 2009-06-01 22:10:38 UTC
(rev 51315)
@@ -36,6 +36,19 @@
if instance:
self.set_instance(instance)
+ def instancedir(self):
+ if self.instance:
+ return os.path.join(settings.instancesdir,self.instance)
+ else:
+ return None
+
+ def dbname(self):
+ """find and return an appropriate database name"""
+ return settings.dbname_prefix+self.instance
+
+ def mysql_allsettings(self):
+ return settings.mysql_command+" "+self.dbname()
+
def set_instance(self,instance):
self.instance=instance
@@ -160,6 +173,9 @@
env["REVISION"]=self.revision or ''
env["TAG"]=self.tag or ''
env["MYSQL_COMMAND"]=settings.mysql_command
+ env["MYSQL_ALLSETTINGS"]=self.mysql_allsettings()
+ env["DBNAME"]=self.dbname()
+ env["INSTANCEDIR"]=self.instancedir()
if isinstance(task,str):
task2=[task]
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
