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

Merge pull request #97 from odoo-dev/master-default-addons-path-fme 

[FIX] If no addons-path provided, include the main addons [Fixes #29]
This commit is contained in:
Fabien Meghazi 2014-05-21 11:15:21 +02:00
parent d5fcc1e1e0 05f376e310
commit 7adfaf786d
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

@ -433,7 +433,9 @@ class configmanager(object):
self.options['root_path'] = os.path.abspath(os.path.expanduser(os.path.expandvars(os.path.dirname(openerp.__file__))))
if not self.options['addons_path'] or self.options['addons_path']=='None':
self.options['addons_path'] = os.path.join(self.options['root_path'], 'addons')
base_addons = os.path.join(self.options['root_path'], 'addons')
main_addons = os.path.abspath(os.path.join(self.options['root_path'], '../addons'))
self.options['addons_path'] = '%s,%s' % (base_addons, main_addons)
else:
self.options['addons_path'] = ",".join(
os.path.abspath(os.path.expanduser(os.path.expandvars(x)))