Skip to content
Snippets Groups Projects
Commit 6d3f7c36a0cc authored by Houzefa Abbasbhay's avatar Houzefa Abbasbhay :slight_smile:
Browse files

Addon path detection fix for Odoo 10

The Odoo 10 base image now merges addons, same as the Odoo 11 one.
parent 058cd3dbc724
No related branches found
No related tags found
No related merge requests found
...@@ -614,7 +614,7 @@ ...@@ -614,7 +614,7 @@
os.path.basename(module)) os.path.basename(module))
) )
all_addons_dir = ['/mnt/addons'] all_addons_dir = ['/mnt/addons']
if odoo_type != 'odoo11': if odoo_type in ('odoo7', 'odoo8'):
all_addons_dir.append('/opt/odoo/sources/odoo/addons') all_addons_dir.append('/opt/odoo/sources/odoo/addons')
if all_addons_dir: if all_addons_dir:
arg.append('--addons-path') arg.append('--addons-path')
......
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
then then
addons_path="--addons-path=$($python -B -c "from six.moves import configparser ; import os ; c = configparser.ConfigParser() ; c.read('${project_home}/setup.cfg') ; print(','.join(['$HOME/src/openobject-server/openerp/addons','$HOME/src/openobject-addons','$HOME/src/openerp-web/addons']+['${project_home}/'+line for line in set(os.path.dirname(path) for path in c.get('odoo_scripts', 'modules').split())]))")" addons_path="--addons-path=$($python -B -c "from six.moves import configparser ; import os ; c = configparser.ConfigParser() ; c.read('${project_home}/setup.cfg') ; print(','.join(['$HOME/src/openobject-server/openerp/addons','$HOME/src/openobject-addons','$HOME/src/openerp-web/addons']+['${project_home}/'+line for line in set(os.path.dirname(path) for path in c.get('odoo_scripts', 'modules').split())]))")"
else else
if [ "$ODOO_TYPE" = "odoo7" ] || [ "$ODOO_TYPE" = "odoo8" ] || [ "$ODOO_TYPE" = "odoo10" ]; if [ "$ODOO_TYPE" = "odoo7" ] || [ "$ODOO_TYPE" = "odoo8" ];
then then
pathes=$($python -B -c "from six.moves import configparser ; import os ; c = configparser.ConfigParser() ; c.read('${project_home}/setup.cfg') ; print(','.join(['$odoo_addons_path/addons']+['${project_home}/'+line for line in set(os.path.dirname(path) for path in c.get('odoo_scripts', 'modules').split())]))") pathes=$($python -B -c "from six.moves import configparser ; import os ; c = configparser.ConfigParser() ; c.read('${project_home}/setup.cfg') ; print(','.join(['$odoo_addons_path/addons']+['${project_home}/'+line for line in set(os.path.dirname(path) for path in c.get('odoo_scripts', 'modules').split())]))")
else else
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment