# HG changeset patch # User Vincent Hatakeyama <vincent.hatakeyama@xcg-consulting.fr> # Date 1520963526 -3600 # Tue Mar 13 18:52:06 2018 +0100 # Node ID 70d2f461f904601943e12172cb80e0b393ef4d49 # Parent cc63d3ead1c894b143c6595524436aaad4021370 do not set data dir if none provided diff --git a/VERSION b/VERSION --- a/VERSION +++ b/VERSION @@ -1,1 +1,1 @@ -2.11 +2.12 diff --git a/do_tests b/do_tests --- a/do_tests +++ b/do_tests @@ -13,7 +13,7 @@ # # - access to pg database # -# Version 2.11 +# Version 2.12 here=$(dirname $0) project_home=$(cd $here && cd .. && echo $PWD) diff --git a/docker_build b/docker_build --- a/docker_build +++ b/docker_build @@ -3,7 +3,7 @@ # Create docker script -# template version 2.11 +# template version 2.12 # TODO add a way to bypass the value, maybe with a key in the setup.cfg file here=$(dirname $0) diff --git a/run_tests b/run_tests --- a/run_tests +++ b/run_tests @@ -5,7 +5,7 @@ # # Either provide the name of the database (first argument) or it will default to <project>_test # The DB user can be overriden by setting ODOO_SCRIPTS_DB_USER. -# Version 2.11 +# Version 2.12 here=$(dirname $0) project_home=$(cd $here && cd .. && echo $PWD) tested_modules=$(python -B -c "import ConfigParser ; c = ConfigParser.ConfigParser() ; c.read('${project_home}/setup.cfg') ; print ','.join(c.get('odoo_scripts', 'module_list_tests', '').split())") diff --git a/setup.cfg b/setup.cfg --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.11 +current_version = 2.12 parse = (?P<major>\d+)\.(?P<minor>\d+) serialize = {major}.{minor} diff --git a/start b/start --- a/start +++ b/start @@ -5,7 +5,7 @@ # # You can set ODOO_DATA_DIR and ODOO_DB_HOST if you want to avoid using the default value ($HOME/var/tmp and localhost) # -# Version 2.11 +# Version 2.12 here=$(dirname $0) project_home=$(cd $here && cd .. && echo $PWD) python="/usr/bin/env python" @@ -79,17 +79,6 @@ # args=$* -if [ "$ODOO_TYPE" = "odoo8" ]; -then - if echo $args | grep -q -e "\( \|^\)--data-dir"; - then - data_dir="" - else - data_dir=" --data-dir=$HOME/var/tmp" - fi -else - data_dir="" -fi if echo $args | grep -q -e "\( \|^\)--db_host"; then db_host="" @@ -127,5 +116,5 @@ # echo "INFO - Version: $($odoo_bin --version)" -echo "DEBUG - command line is: $odoo_bin $config $db_host $data_dir $addons_path $args" -$odoo_bin $config $db_host $data_dir $addons_path $args +echo "DEBUG - command line is: $odoo_bin $config $db_host $addons_path $args" +$odoo_bin $config $db_host $addons_path $args