Commit 7cda9241 authored by Grégory Wisniewski's avatar Grégory Wisniewski

Set the uuid supplied on command line after the configuration is loaded.


git-svn-id: https://svn.erp5.org/repos/neo/branches/prototype3@1207 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent f4868b36
...@@ -42,7 +42,6 @@ class Application(object): ...@@ -42,7 +42,6 @@ class Application(object):
def __init__(self, filename, section, reset=False, uuid=None): def __init__(self, filename, section, reset=False, uuid=None):
config = ConfigurationManager(filename, section) config = ConfigurationManager(filename, section)
self.uuid = uuid
self.name = config.getName() self.name = config.getName()
logging.debug('the name is %s', self.name) logging.debug('the name is %s', self.name)
self.connector_handler = getConnectorHandler(config.getConnector()) self.connector_handler = getConnectorHandler(config.getConnector())
...@@ -84,6 +83,10 @@ class Application(object): ...@@ -84,6 +83,10 @@ class Application(object):
self.dm.setup(reset) self.dm.setup(reset)
self.loadConfiguration() self.loadConfiguration()
# force node uuid from command line argument, for testing purpose only
if uuid is not None:
self.uuid = uuid
def loadConfiguration(self): def loadConfiguration(self):
"""Load persistent configuration data from the database. """Load persistent configuration data from the database.
If data is not present, generate it.""" If data is not present, generate it."""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment