[MERGE] forward port of branch saas-6 up to 63e92cb

1 files changed, 7 insertions, 0 deletions

diff --git a/openerp/cli/start.py b/openerp/cli/start.py
index d23bca8b8d5..b0cc932e19d 100644
--- a/openerp/cli/start.py
+++ b/openerp/cli/start.py
@@ -61,6 +61,13 @@ class Start(Command):
         if '--db-filter' not in cmdargs:
             cmdargs.append('--db-filter=^%s$' % args.db_name)
 
+        # Remove --path /-p options from the command arguments
+        def to_remove(i, l):
+            return l[i] == '-p' or l[i].startswith('--path') or \
+                (i > 0 and l[i-1] in ['-p', '--path'])
+        cmdargs = [v for i, v in enumerate(cmdargs)
+                   if not to_remove(i, cmdargs)]
+
         main(cmdargs)
 
 def die(message, code=1):