odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] merged from trunk-server-development branch 

bzr revid: hmo@tinyerp.com-20110215101923-nh0t5cgf9y4n4fmz
This commit is contained in:
Harry (OpenERP) 2011-02-15 15:49:23 +05:30
parent 0eee53f92c e1d2a87fc9
commit 5e65a44d19
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openerp/tools/config.py
View File

@ -338,7 +338,9 @@ class configmanager(object):
if not self.options['addons_path'] or self.options['addons_path']=='None':
self.options['addons_path'] = os.path.join(self.options['root_path'], 'addons')
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["demo"] = not opt.without_demo and self.options['init'] or {}