Fixed a bug in tools/initdb.py and tools/updatedb.py that caused them to only use some of the configured settings.
This commit is contained in:
parent
f6031b1cc3
commit
ba4340f55f
6
NEWS
6
NEWS
|
@ -1,5 +1,7 @@
|
||||||
1.4.27:
|
1.4.27: August 22, 2008
|
||||||
*
|
* Fixed a bug in tools/initdb.py and tools/updatedb.py that caused them to
|
||||||
|
only use some of the configured settings.
|
||||||
|
* Progress on Luminotes Desktop, including the Windows installer.
|
||||||
|
|
||||||
1.4.26: August 20, 2008:
|
1.4.26: August 20, 2008:
|
||||||
* Ported all database code to support SQLite in addition to the existing
|
* Ported all database code to support SQLite in addition to the existing
|
||||||
|
|
|
@ -132,9 +132,9 @@ def main( args = None ):
|
||||||
host = settings[ u"global" ].get( u"luminotes.db_host" )
|
host = settings[ u"global" ].get( u"luminotes.db_host" )
|
||||||
database = Database(
|
database = Database(
|
||||||
host = host,
|
host = host,
|
||||||
ssl_mode = settings[ u"global" ].get( u"luminotes.db_ssl_mode" ),
|
ssl_mode = cherrypy.config.configMap[ u"global" ].get( u"luminotes.db_ssl_mode" ),
|
||||||
)
|
)
|
||||||
initializer = Initializer( database, host, settings, desktop, nuke )
|
initializer = Initializer( database, host, cherrypy.config.configMap, desktop, nuke )
|
||||||
|
|
||||||
|
|
||||||
def fix_note_contents( contents, notebook_id, note_ids, settings ):
|
def fix_note_contents( contents, notebook_id, note_ids, settings ):
|
||||||
|
|
|
@ -88,11 +88,12 @@ def main( args ):
|
||||||
settings = Production.settings
|
settings = Production.settings
|
||||||
|
|
||||||
cherrypy.config.update( settings )
|
cherrypy.config.update( settings )
|
||||||
|
|
||||||
database = Database(
|
database = Database(
|
||||||
host = settings[ u"global" ].get( u"luminotes.db_host" ),
|
host = cherrypy.config.configMap[ u"global" ].get( u"luminotes.db_host" ),
|
||||||
ssl_mode = settings[ u"global" ].get( u"luminotes.db_ssl_mode" ),
|
ssl_mode = cherrypy.config.configMap[ u"global" ].get( u"luminotes.db_ssl_mode" ),
|
||||||
)
|
)
|
||||||
initializer = Updater( database, settings )
|
initializer = Updater( database, cherrypy.config.configMap )
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
|
|
Reference in New Issue