From 938ae8358545c41ea959cbfd8cd80201daaec31a Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 22 Sep 2017 15:07:02 +0200 Subject: [FIX] setup: fix the python regex to prepare dev environement --- setup/setup_dev.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup/setup_dev.py') diff --git a/setup/setup_dev.py b/setup/setup_dev.py index a5194c70569..d8e1c171556 100755 --- a/setup/setup_dev.py +++ b/setup/setup_dev.py @@ -117,7 +117,7 @@ def cmd_setup_git_review(): def setup_deps_debian(git_dir): debian_control_path = os.path.join(git_dir, 'debian/control') debian_control = open(debian_control_path).read() - debs = re.findall('python-[0-9a-z]+',debian_control) + debs = re.findall('python3-[0-9a-z]+',debian_control) debs += ["postgresql"] proc = subprocess.Popen(['sudo','apt-get','install'] + debs, stdin=open('/dev/tty')) proc.communicate() -- cgit v1.2.3 From 348b2d713a980b5e4be6105b06e04e8c438e5a97 Mon Sep 17 00:00:00 2001 From: Jairo Llopis Date: Thu, 5 Oct 2017 16:00:36 +0200 Subject: [FIX] P3 syntax errors preventing compileall Not that we really care about compileall, but some people apparently do. Fixes #19871 Closes #19849 --- setup/setup_dev.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'setup/setup_dev.py') diff --git a/setup/setup_dev.py b/setup/setup_dev.py index d8e1c171556..bc430db42b6 100755 --- a/setup/setup_dev.py +++ b/setup/setup_dev.py @@ -13,6 +13,7 @@ # subclassing the Command object # #---------------------------------------------------------- +from __future__ import print_function import os import re import sys @@ -28,7 +29,7 @@ if re.search('github.com[:/]odoo/odoo.git$', sys.argv[2]): """ def printf(f,*l): - print "odoo:" + f % l + print("odoo:" + f % l) def run(*l): if isinstance(l[0], list): -- cgit v1.2.3