OERPTools

Merge lp:~gs.clearcorp/oerptools/2.0_oerptools into lp:oerptools

  1. 2.0_oerptools
  2. Merge into 2.0
Proposed by Glen Sojo
Status: Merged
Merged at revision: 431
Proposed branch: lp:~gs.clearcorp/oerptools/2.0_oerptools
Merge into: lp:oerptools
Diff against target: 48 lines (+8/-1)
1 file modified
oerptools/oerp/server.py (+8/-1)
To merge this branch: bzr merge lp:~gs.clearcorp/oerptools/2.0_oerptools
Reviewer Review Type Date Requested Status
ClearCorp drivers Pending
Review via email: mp+225841@code.launchpad.net

Description of the change

[ADD] - Added support for Ubuntu 12.04+ Postgresql 9.3 and installation of poppler-utils package.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'oerptools/oerp/server.py'
2--- oerptools/oerp/server.py 2014-04-16 18:34:24 +0000
3+++ oerptools/oerp/server.py 2014-07-07 14:37:48 +0000
4@@ -39,8 +39,11 @@
5 self._postgresql_init_suffix = '-8.4'
6 if self._os_info['version'][1] < '11.10':
7 self._postgresql_version = '8.4'
8- else:
9+ if self._os_info['version'][1] < '14.04':
10 self._postgresql_version = '9.1'
11+ else:
12+ self._postgresql_version = '9.3'
13+ # TODO check versions for Linux Mint and Arch Linux
14 elif self._os_info['os'] == 'Linux' and self._os_info['version'][0] == 'LinuxMint':
15 self._postgresql_version = '9.1'
16 elif self._os_info['os'] == 'Linux' and self._os_info['version'][0] == 'arch':
17@@ -169,6 +172,7 @@
18 'python-zsi': 'python-zsi',
19 'tinymce': 'tinymce',
20 'wget': 'wget',
21+ 'poppler-utils': 'poppler-utils'
22 },
23
24 'arch': {
25@@ -207,6 +211,7 @@
26 'python-yaml': 'python2-yaml',
27 'tinymce': None,
28 'wget': 'wget',
29+ 'poppler-utils': 'poppler-utils' # Needs review on arch
30 },
31 'aur': {
32 'python-mock': 'python2-mock',
33@@ -276,6 +281,7 @@
34 'python-simplejson',
35 'python-pyparsing',
36 # Recommended
37+ 'poppler-utils',
38 ]
39
40 # Packages for 7.0
41@@ -316,6 +322,7 @@
42 'ghostscript',
43 'python-imaging',
44 'python-matplotlib',
45+ 'poppler-utils',
46 ]
47
48 # Test distro and call appropriate function

Subscribers

People subscribed via source and target branches