[MERGE] merged from trunk-server-development branch
bzr revid: hmo@tinyerp.com-20110215101923-nh0t5cgf9y4n4fmz
This commit is contained in:
commit
5e65a44d19
|
@ -338,7 +338,9 @@ class configmanager(object):
|
||||||
if not self.options['addons_path'] or self.options['addons_path']=='None':
|
if not self.options['addons_path'] or self.options['addons_path']=='None':
|
||||||
self.options['addons_path'] = os.path.join(self.options['root_path'], 'addons')
|
self.options['addons_path'] = os.path.join(self.options['root_path'], 'addons')
|
||||||
else:
|
else:
|
||||||
self.options['addons_path'] = os.path.abspath(os.path.expanduser(os.path.expandvars(self.options['addons_path'])))
|
self.options['addons_path'] = ",".join(
|
||||||
|
os.path.abspath(os.path.expanduser(os.path.expandvars(x)))
|
||||||
|
for x in self.options['addons_path'].split(','))
|
||||||
|
|
||||||
self.options['init'] = opt.init and dict.fromkeys(opt.init.split(','), 1) or {}
|
self.options['init'] = opt.init and dict.fromkeys(opt.init.split(','), 1) or {}
|
||||||
self.options["demo"] = not opt.without_demo and self.options['init'] or {}
|
self.options["demo"] = not opt.without_demo and self.options['init'] or {}
|
||||||
|
|
Loading…
Reference in New Issue