summaryrefslogtreecommitdiff
path: root/odoo/cli/start.py
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2017-04-25 12:36:02 +0200
committerChristophe Simonis <chs@odoo.com>2017-04-25 12:36:02 +0200
commit4441237b0a80cc8eca04a35ad825bce876a2d7b6 (patch)
treeefafd204a16cc8fd762ac24f3af4ddf90ae57d6e /odoo/cli/start.py
parent38bb4f07d0bfb0de12414ab99c4815c0d9ff48a6 (diff)
parentab68a1c6740162c59fa54effc6133964d0a51bc8 (diff)
[MERGE] forward port branch saas-15 up to ab68a1c6740
Diffstat (limited to 'odoo/cli/start.py')
-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 306722b23da..88df395eab5 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