diff -r 5507aa75f601 -r a191b3b9e455 server/serverctl.py --- a/server/serverctl.py Thu Nov 12 17:36:15 2009 +0100 +++ b/server/serverctl.py Fri Nov 13 09:13:30 2009 +0100 @@ -133,6 +133,9 @@ config.input_config('pyro', inputlevel) print '\n'+underline_title('Configuring the sources') sourcesfile = config.sources_file() + # XXX hack to make Method('default_instance_id') usable in db option + # defs (in native.py) + Configuration.default_instance_id = staticmethod(lambda: config.appid) sconfig = Configuration(options=SOURCE_TYPES['native'].options) sconfig.adapter = 'native' sconfig.input_config(inputlevel=inputlevel)