summaryrefslogtreecommitdiff
path: root/odoo/cli
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2017-04-24 13:24:13 +0200
committerChristophe Simonis <chs@odoo.com>2017-04-24 13:24:13 +0200
commitab68a1c6740162c59fa54effc6133964d0a51bc8 (patch)
tree17c88ea4c56c70594c56058eaff284a673425169 /odoo/cli
parent1f8e2777a89d104ae64a0ce59c9570e2a3df1b1b (diff)
parent64b7d4e8a8df180bc598e2df56992d373e23b44b (diff)
[MERGE] forward port branch saas-14 up to 64b7d4e8a8d
Diffstat (limited to 'odoo/cli')
-rw-r--r--odoo/cli/start.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/odoo/cli/start.py b/odoo/cli/start.py
index 043c411ad8d..bf15776295b 100644
--- a/odoo/cli/start.py
+++ b/odoo/cli/start.py
@@ -35,6 +35,9 @@ class Start(Command):
args, unknown = parser.parse_known_args(args=cmdargs)
+ # When in a virtualenv, by default use it's path rather than the cwd
+ if args.path == '.' and os.environ.get('VIRTUAL_ENV'):
+ args.path = os.environ.get('VIRTUAL_ENV')
project_path = os.path.abspath(os.path.expanduser(os.path.expandvars(args.path)))
module_root = get_module_root(project_path)
db_name = None