diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-07-22 16:17:54 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-07-22 16:17:54 +0200 |
| commit | 2cf91d16a5f844a2a3d5d22c025c180a6615bab8 (patch) | |
| tree | a7bc3974a9c349ae1575fd3b10bbb25d9b74b9ab /setup | |
| parent | d74e0c3e9d9cd80bf532ba90f7c634ff55881b51 (diff) | |
| parent | 63e92cbc9621813a276e340b7d961cbd8f8b97c4 (diff) | |
[MERGE] forward port of branch saas-6 up to 63e92cb
Diffstat (limited to 'setup')
| -rw-r--r-- | setup/package.dfsrc | 1 | ||||
| -rwxr-xr-x | setup/package.py | 7 | ||||
| -rw-r--r-- | setup/redhat/postinstall.sh | 2 | ||||
| -rwxr-xr-x | setup/win32/static/getfiles.sh | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/setup/package.dfsrc b/setup/package.dfsrc index a8e3170fb08..6b6c06efbf9 100644 --- a/setup/package.dfsrc +++ b/setup/package.dfsrc @@ -30,6 +30,7 @@ RUN apt-get update -qq && \ python-pip \ build-essential \ python -y && \ + easy_install --upgrade pip && \ rm -rf /var/lib/apt/lists/* RUN pip install --upgrade pip diff --git a/setup/package.py b/setup/package.py index fd4071ecdb2..b3cbac36303 100755 --- a/setup/package.py +++ b/setup/package.py @@ -105,12 +105,12 @@ class OdooDocker(object): def __init__(self): self.log_file = NamedTemporaryFile(mode='w+b', prefix="bash", suffix=".txt", delete=False) self.port = 8069 # TODO sle: reliable way to get a free port? - self.prompt_re = '\[root@nightly-tests\] #' + self.prompt_re = '[root@nightly-tests] # ' self.timeout = 600 def system(self, command): self.docker.sendline(command) - self.docker.expect(self.prompt_re) + self.docker.expect_exact(self.prompt_re) def start(self, docker_image, build_dir, pub_dir): self.build_dir = build_dir @@ -119,7 +119,8 @@ class OdooDocker(object): self.docker = pexpect.spawn( 'docker run -v %s:/opt/release -p 127.0.0.1:%s:8069' ' -t -i %s /bin/bash --noediting' % (self.build_dir, self.port, docker_image), - timeout=self.timeout + timeout=self.timeout, + searchwindowsize=len(self.prompt_re) + 1, ) time.sleep(2) # let the bash start self.docker.logfile_read = self.log_file diff --git a/setup/redhat/postinstall.sh b/setup/redhat/postinstall.sh index b9ef1f908e0..53435408e60 100644 --- a/setup/redhat/postinstall.sh +++ b/setup/redhat/postinstall.sh @@ -54,4 +54,4 @@ ExecStart=/usr/bin/odoo.py --config=/etc/odoo/openerp-server.conf [Install] WantedBy=multi-user.target EOF -easy_install pyPdf vatnumber pydot psycogreen +easy_install pyPdf vatnumber pydot psycogreen suds-jurko diff --git a/setup/win32/static/getfiles.sh b/setup/win32/static/getfiles.sh index 9d0ebd556ad..5b15c103197 100755 --- a/setup/win32/static/getfiles.sh +++ b/setup/win32/static/getfiles.sh @@ -13,7 +13,7 @@ trap cleanup EXIT wget -q http://get.enterprisedb.com/postgresql/postgresql-9.3.5-1-windows.exe # wkhtmltopdf -wget -q -P $TEMPDIR http://downloads.sourceforge.net/project/wkhtmltopdf/0.12.1/wkhtmltox-0.12.1.2_msvc2013-win32.exe +wget -q -P $TEMPDIR http://download.gna.org/wkhtmltopdf/0.12/0.12.1/wkhtmltox-0.12.1.2_msvc2013-win32.exe 7z x -o$TEMPDIR $TEMPDIR/wkhtmltox-0.12.1.2_msvc2013-win32.exe cp $TEMPDIR/bin/wkhtmltopdf.exe ./wkhtmltopdf |