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

Allow initialize_sys_path() to be called more than once

This commit is contained in:
Fabien Meghazi 2014-05-30 18:23:15 +02:00
parent 4ca17a2afa
commit faa60474ce
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
openerp/modules/module.py
View File

@ -42,7 +42,8 @@ MANIFEST = '__openerp__.py'
_logger = logging.getLogger(__name__) _logger = logging.getLogger(__name__)
# addons path as a list # addons path as a list
ad_paths = [] ad_paths = [tools.config.addons_data_dir]
hooked = False
# Modules already loaded # Modules already loaded
loaded = [] loaded = []
@ -85,17 +86,21 @@ def initialize_sys_path():
PYTHONPATH. PYTHONPATH.
""" """
global ad_paths global ad_paths
if ad_paths: global hooked
return
ad_paths = [tools.config.addons_data_dir] for ad in tools.config['addons_path'].split(','):
ad_paths += map(lambda m: os.path.abspath(tools.ustr(m.strip())), tools.config['addons_path'].split(',')) ad = os.path.abspath(tools.ustr(ad.strip()))
if ad not in ad_paths:
ad_paths.append(ad)
# add base module path # add base module path
base_path = os.path.abspath(os.path.join(os.path.dirname(os.path.dirname(__file__)), 'addons')) base_path = os.path.abspath(os.path.join(os.path.dirname(os.path.dirname(__file__)), 'addons'))
ad_paths += [base_path] if base_path not in ad_paths:
ad_paths.append(base_path)
sys.meta_path.append(AddonsImportHook()) if not hooked:
sys.meta_path.append(AddonsImportHook())
hooked = True
def get_module_path(module, downloaded=False, display_warning=True): def get_module_path(module, downloaded=False, display_warning=True):
"""Return the path of the given module. """Return the path of the given module.