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:
commit
7adfaf786d
|
@ -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__))))
|
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':
|
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:
|
else:
|
||||||
self.options['addons_path'] = ",".join(
|
self.options['addons_path'] = ",".join(
|
||||||
os.path.abspath(os.path.expanduser(os.path.expandvars(x)))
|
os.path.abspath(os.path.expanduser(os.path.expandvars(x)))
|
||||||
|
|
Loading…
Reference in New Issue