# HG changeset patch # User Vincent Hatakeyama <vincent.hatakeyama@xcg-consulting.fr> # Date 1539782762 -7200 # Wed Oct 17 15:26:02 2018 +0200 # Node ID 277f531bfe1211267856ba0f69692ea078121d9a # Parent f5a0bc01343e89e8917eb3a1cb9e6917abdb5e68 :ambulance: use correct configuration file in odoo 11 or 12 when binding to local configuration file diff --git a/docker_dev_start.py b/docker_dev_start.py --- a/docker_dev_start.py +++ b/docker_dev_start.py @@ -32,9 +32,9 @@ _logger = logging.getLogger(__name__) -__version__ = '1.1.7' +__version__ = '1.1.8' __date__ = '2017-08-11' -__updated__ = '2018-08-30' +__updated__ = '2018-10-17' def which(program): @@ -468,9 +468,13 @@ user = db_user password = db_password if os.path.isfile(local_conf_path): - _logger.info('Local configuration file found: %s' % local_conf_path) - binds.append('%s:/opt/odoo/etc' % os.path.join( - project_path, local_conf_dir)) + _logger.info('Local configuration file found: %s', local_conf_path) + odoo_conf_path = ( + '/etc/odoo' if odoo_type in ('11.0', '12.0') + else '/opt/odoo/etc' + ) + binds.append('{}:{}'.format(os.path.join( + project_path, local_conf_dir), odoo_conf_path)) cp_local = ConfigParser() cp_local.read(local_conf_path) if not user: