Merge lp:~cv.clearcorp/oerptools/oerptools into lp:oerptools

[Carlos Vásquez (ClearCorp)]

[UPDATE] Oerptools can be installed in LinuxMint.
[FIX] Options in oerp-install addons can be selected and phppgadmin is fully installed.
[FIX] bad branch in banking-addon trunk

[lp:~cv.clearcorp/oerptools/oerptools]

427. By Ronald Rubi on 2014-02-18

[MRG] Oerptools can be installed in LinuxMint.

=== modified file 'oerptools/dev/repository.py'
--- oerptools/dev/repository.py	2013-02-22 20:08:23 +0000
+++ oerptools/dev/repository.py	2014-02-17 18:05:35 +0000
@@ -175,7 +175,7 @@
         self._branch_project('openerp-costa-rica',    False, ['6.1', '7.0', 'trunk'])
         self._branch_project('oerptools',             False, ['1.0', '2.0', 'trunk'])
         
-        self._branch_project('banking-addons',        True,  ['6.1', 'trunk'])
+        self._branch_project('banking-addons',        True,  ['6.1'])
         
         return True
     
@@ -196,7 +196,7 @@
         self._update_project('openerp-costa-rica',    False, ['6.1', '7.0', 'trunk'])
         self._update_project('oerptools',             False, ['1.0', '2.0', 'trunk'])
         
-        self._update_project('banking-addons',        True,  ['6.1', 'trunk'])
+        self._update_project('banking-addons',        True,  ['6.1'])
         
         return True
     
@@ -217,7 +217,7 @@
         self._reset_project_locations('openerp-costa-rica',    False, ['6.1', '7.0', 'trunk'])
         self._reset_project_locations('oerptools',             False, ['1.0', '2.0', 'trunk'])
         
-        self._reset_project_locations('banking-addons',        True,  ['6.1', 'trunk'])
+        self._reset_project_locations('banking-addons',        True,  ['6.1'])
         
         return True
     
@@ -336,7 +336,7 @@
         self._src_branch_project('openerp-ccorp-addons',  False, ['6.1', '7.0', 'trunk'])
         self._src_branch_project('openerp-costa-rica',    False, ['6.1', '7.0', 'trunk'])
         
-        self._src_branch_project('banking-addons',        True,  ['6.1', 'trunk'])
+        self._src_branch_project('banking-addons',        True,  ['6.1'])
         
         self._src_compress_project('openobject-server',     True,  ['6.1', '7.0', 'trunk'])
         self._src_compress_project('openobject-addons',     True,  ['6.1', '7.0', 'trunk'])
@@ -345,7 +345,7 @@
         self._src_compress_project('openerp-ccorp-addons',  False, ['6.1', '7.0', 'trunk'])
         self._src_compress_project('openerp-costa-rica',    False, ['6.1', '7.0', 'trunk'])
         
-        self._src_compress_project('banking-addons',        True,  ['6.1', 'trunk'])
+        self._src_compress_project('banking-addons',        True,  ['6.1'])
         
         self._src_compress_repo()
         
@@ -365,7 +365,7 @@
         self._src_update_project('openerp-ccorp-addons',  False, ['6.1', '7.0', 'trunk'])
         self._src_update_project('openerp-costa-rica',    False, ['6.1', '7.0', 'trunk'])
         
-        self._src_update_project('banking-addons',        True,  ['6.1', 'trunk'])
+        self._src_update_project('banking-addons',        True,  ['6.1'])
         
         self._src_compress_project('openobject-server',     True,  ['6.1', '7.0', 'trunk'])
         self._src_compress_project('openobject-addons',     True,  ['6.1', '7.0', 'trunk'])
@@ -374,7 +374,7 @@
         self._src_compress_project('openerp-ccorp-addons',  False, ['6.1', '7.0', 'trunk'])
         self._src_compress_project('openerp-costa-rica',    False, ['6.1', '7.0', 'trunk'])
         
-        self._src_compress_project('banking-addons',        True,  ['6.1', 'trunk'])
+        self._src_compress_project('banking-addons',        True,  ['6.1'])
         
         self._src_compress_repo()
         

=== modified file 'oerptools/install/install.py'
--- oerptools/install/install.py	2013-01-24 08:31:39 +0000
+++ oerptools/install/install.py	2014-02-17 18:05:35 +0000
@@ -40,7 +40,7 @@
     def oerptools_install(install_dir):
         os_version = tools.get_os()
         if os_version['os'] == 'Linux':
-            if os_version['version'][0] == 'Ubuntu':
+            if (os_version['version'][0] == 'Ubuntu') or (os_version['version'][0] == 'LinuxMint'):
                 return ubuntu_oerptools_install(install_dir)
             elif os_version['version'][0] == 'arch':
                 return arch_oerptools_install(install_dir)

=== modified file 'oerptools/lib/apache.py'
--- oerptools/lib/apache.py	2013-02-26 16:11:41 +0000
+++ oerptools/lib/apache.py	2014-02-17 18:05:35 +0000
@@ -34,13 +34,16 @@
 def apache_install():
     os_version = tools.get_os()
     if os_version['os'] == 'Linux':
-        if os_version['version'][0] == 'Ubuntu':
-            return ubuntu_apache_install()
+        string = ''
+        if (os_version['version'][0] == 'Ubuntu') or (os_version['version'][0] == 'LinuxMint'):
+            if os_version['version'][0] == 'LinuxMint':
+                string = '000-'
+            return ubuntu_apache_install(string)
         elif os_version['version'][0] == 'arch':
             return arch_apache_install()
     return False
 
-def ubuntu_apache_install():
+def ubuntu_apache_install(string):
     _logger.info('Installing Apache web server')
     if not tools.ubuntu_install_package(['apache2']):
         _logger.error('Failed to install apache package. Exiting.')
@@ -56,7 +59,7 @@
     if tools.exec_command('a2enmod ssl rewrite suexec include proxy proxy_http proxy_connect proxy_ftp headers', as_root=True):
         _logger.error('Failed to enable Apache modules. Exiting.')
         return False
-    if tools.exec_command('a2ensite default default-ssl', as_root=True):
+    if tools.exec_command('a2ensite '+string+'default default-ssl', as_root=True):
         _logger.error('Failed to enable Apache sites. Exiting.')
         return False
     if tools.exec_command('/etc/init.d/apache2 restart', as_root=True):
@@ -70,12 +73,12 @@
         _logger.error('Failed to install apache package. Exiting.')
         return False
     return True
-    #TODO: lp:1133347 configuration for apache in arch
+    #TODO: configuration for apache in arch
 
 def apache_restart():
     os_version = tools.get_os()
     if os_version['os'] == 'Linux':
-        if os_version['version'][0] == 'Ubuntu':
+        if (os_version['version'][0] == 'Ubuntu') or (os_version['version'][0] == 'LinuxMint'):
             return ubuntu_apache_restart()
         elif os_version['version'][0] == 'arch':
             return arch_apache_restart()

=== modified file 'oerptools/lib/bzr.py'
--- oerptools/lib/bzr.py	2013-02-26 16:11:41 +0000
+++ oerptools/lib/bzr.py	2014-02-17 18:05:35 +0000
@@ -33,7 +33,7 @@
 def bzr_install():
     os_version = tools.get_os()
     if os_version and os_version['os'] == 'Linux':
-        if os_version['version'][0] == 'Ubuntu':
+        if (os_version['version'][0] == 'Ubuntu') or (os_version['version'][0] == 'LinuxMint'):
             return ubuntu_bzr_install()
         elif os_version['version'][0] == 'arch':
             return arch_bzr_install()
@@ -41,12 +41,12 @@
     return False
 
 def ubuntu_bzr_install():
-    #TODO: lp:1133369 logger gets the output of the command
+    #TODO: logger gets the output of the command
     _logger.info('Installing bzr...')
     return tools.ubuntu_install_package(['bzr', 'python-bzrlib'], update=True)
 
 def arch_bzr_install():
-    #TODO: lp:1133369 logger gets the output of the command
+    #TODO: logger gets the output of the command
     _logger.info('Installing bzr...')
     return tools.arch_install_repo_package(['bzr'])
 
@@ -66,7 +66,7 @@
     load_plugins()
 
 def bzr_init_repo(target, no_trees=False):
-    #TODO: lp:1133372 do this with the python library
+    #TODO: do this with the python library
     if no_trees:
         if tools.exec_command('bzr init-repo --no-tree %s' % target):
             _logger.error('Failed to create repository in: %s. Exiting.' % target)

=== modified file 'oerptools/lib/config.py'
--- oerptools/lib/config.py	2013-02-26 19:01:35 +0000
+++ oerptools/lib/config.py	2014-02-17 18:05:35 +0000
@@ -546,5 +546,5 @@
             tools.exec_command('chmod o-w %s' % file_path, as_root=True)
         
         return file_path
-    
+
 params = configParameters()

=== modified file 'oerptools/lib/phppgadmin.py'
--- oerptools/lib/phppgadmin.py	2013-03-11 19:31:50 +0000
+++ oerptools/lib/phppgadmin.py	2014-02-17 18:05:35 +0000
@@ -34,7 +34,7 @@
 def phppgadmin_install():
     os_version = tools.get_os()
     if os_version['os'] == 'Linux':
-        if os_version['version'][0] == 'Ubuntu':
+        if (os_version['version'][0] == 'Ubuntu') or (os_version['version'][0] == 'LinuxMint'):
             return ubuntu_phppgadmin_install()
         elif os_version['version'][0] == 'arch':
             return arch_phppgadmin_install()
@@ -42,15 +42,15 @@
 
 def ubuntu_phppgadmin_install():
     _logger.info('Installing PostgreSQL Web administration interface (phppgadmin)')
-    if tools.ubuntu_install_package(['phppgadmin']):
+    if not tools.ubuntu_install_package(['phppgadmin']):
         _logger.error('Failed to install phppgadmin package. Exiting.')
         return False
-    return
+    return True
 
 def arch_phppgadmin_install():
     _logger.info('Installing PostgreSQL Web administration interface (phppgadmin)')
-    if tools.arch_install_repo_package(['phppgadmin']):
+    if not tools.arch_install_repo_package(['phppgadmin']):
         _logger.error('Failed to install phppgadmin package. Exiting.')
         return False
-    #TODO: lp:1133345 configuration for phppgadmin in arch
+    #TODO: configuration for phppgadmin in arch
 

=== modified file 'oerptools/oerp/instance.py'
--- oerptools/oerp/instance.py	2013-03-01 22:44:19 +0000
+++ oerptools/oerp/instance.py	2014-02-17 18:05:35 +0000
@@ -42,6 +42,8 @@
                 self._postgresql_version = '8.4'
             else:
                 self._postgresql_version = '9.1'
+        if self._os_info['os'] == 'Linux' and self._os_info['version'][0] == 'LinuxMint':
+            self._postgresql_version = '9.1'
         
         self._branch = config.params['branch'] or '7.0'
         

=== modified file 'oerptools/oerp/server.py'
--- oerptools/oerp/server.py	2013-09-19 17:51:24 +0000
+++ oerptools/oerp/server.py	2014-02-17 18:05:35 +0000
@@ -41,6 +41,8 @@
                 self._postgresql_version = '8.4'
             else:
                 self._postgresql_version = '9.1'
+        elif self._os_info['os'] == 'Linux' and self._os_info['version'][0] == 'LinuxMint':
+            self._postgresql_version = '9.1'
         elif self._os_info['os'] == 'Linux' and self._os_info['version'][0] == 'arch':
             self._postgresql_version = '9.1'
         
@@ -51,33 +53,30 @@
         else:
             _logger.debug('Server initialized without instance: %s' % instance)
             self._branch = config.params['branch'] or '7.0'
-        print config.params[self._branch+'_installation_type']
-        print config.params['installation_type']
         self._installation_type = config.params[self._branch+'_installation_type'] or config.params['installation_type'] or 'dev'
-        print self._installation_type
         self._user = config.params[self._branch+'_user'] or config.params['user'] or None
         
-        if self._branch+'_install_openobject_addons' in config.params:
+        if 'install_openobject_addons' in config.params:
+            self._install_openobject_addons = config.params['install_openobject_addons']
+        elif self._branch+'_install_openobject_addons' in config.params:
             self._install_openobject_addons = config.params[self._branch+'_install_openobject_addons']
-        elif 'install_openobject_addons' in config.params:
-            self._install_openobject_addons = config.params['install_openobject_addons']
         else:
-            self._install_openobject_addons = True
-            
-        if self._branch+'_install_openerp_ccorp_addons' in config.params:
+            self._install_openobject_addons = True  
+        
+        if 'install_openerp_ccorp_addons' in config.params:
+            self._install_openerp_ccorp_addons = config.params['install_openerp_ccorp_addons']
+        elif self._branch+'_install_openerp_ccorp_addons' in config.params:
             self._install_openerp_ccorp_addons = config.params[self._branch+'_install_openerp_ccorp_addons']
-        elif 'install_openerp_ccorp_addons' in config.params:
-            self._install_openerp_ccorp_addons = config.params['install_openerp_ccorp_addons']
         else:
             self._install_openerp_ccorp_addons = True
             
-        if self._branch+'_install_openerp_costa_rica' in config.params:
+        if 'install_openerp_costa_rica' in config.params:
+            self._install_openerp_costa_rica = config.params['install_openerp_costa_rica']
+        elif self._branch+'_install_openerp_costa_rica' in config.params:
             self._install_openerp_costa_rica = config.params[self._branch+'_install_openerp_costa_rica']
-        elif 'install_openerp_costa_rica' in config.params:
-            self._install_openerp_costa_rica = config.params['install_openerp_costa_rica']
         else:
             self._install_openerp_costa_rica = True
-            
+    
         if self._branch+'_update_postgres_hba' in config.params:
             self._update_postgres_hba = config.params[self._branch+'_update_postgres_hba']
         elif 'update_postgres_hba' in config.params:
@@ -321,7 +320,7 @@
         
         # Test distro and call appropriate function
         if self._os_info and self._os_info['os'] == 'Linux':
-            if self._os_info['version'][0] == 'Ubuntu':
+            if (self._os_info['version'][0] == 'Ubuntu') or (self._os_info['version'][0] == 'LinuxMint'):
                 return self._ubuntu_install_python_libs(packages)
             elif self._os_info['version'][0] == 'arch':
                 return self._arch_install_python_libs(packages)
@@ -390,7 +389,7 @@
         _logger.info('Installing PostgreSQL.')
         # Test distro and call appropriate function
         if self._os_info and self._os_info['os'] == 'Linux':
-            if self._os_info['version'][0] == 'Ubuntu':
+            if (self._os_info['version'][0] == 'Ubuntu') or (self._os_info['version'][0] == 'LinuxMint'):
                 return self._ubuntu_install_postgresql()
             elif self._os_info['version'][0] == 'arch':
                 return self._arch_install_postgresql()
@@ -433,7 +432,7 @@
         _logger.info('Updating PostgreSQL pg_hba.conf file.')
         # Test distro and call appropriate function
         if self._os_info and self._os_info['os'] == 'Linux':
-            if self._os_info['version'][0] == 'Ubuntu':
+            if (self._os_info['version'][0] == 'Ubuntu') or (self._os_info['version'][0] == 'LinuxMint'):
                 return self._ubuntu_do_update_postgres_hba()
             elif self._os_info['version'][0] == 'arch':
                 return self._arch_do_update_postgres_hba()
@@ -511,7 +510,7 @@
         if tools.exec_command('mkdir -p /usr/local/src/oerptools/oerp', as_root=True):
             _logger.error('Failed to create /usr/local/src/oerptools/oerp dir. Exiting.')
             return False
-        
+
         if 'repo_tgz' in config.params and config.params['repo_tgz'] and os.path.isfile(os.path.abspath(config.params['repo_tgz'])):
             if tools.exec_command('cp %s /usr/local/src/oerptools/oerp/openerp.tgz' % os.path.abspath(config.params['repo_tgz']), as_root=True):
                 _logger.warning('Failed to copy %s to /usr/local/src/oerptools/oerp.')
@@ -661,13 +660,16 @@
     def _do_install_apache(self):
         os_version = tools.get_os()
         if os_version['os'] == 'Linux':
-            if os_version['version'][0] == 'Ubuntu':
-                return self._ubuntu_do_install_apache()
+            string = ''
+            if (os_version['version'][0] == 'Ubuntu') or (os_version['version'][0] == 'LinuxMint'):
+                if os_version['version'][0] == 'LinuxMint':
+                    string = '000-'
+                return self._ubuntu_do_install_apache(string)
             elif os_version['version'][0] == 'arch':
                 return self._arch_do_install_apache()
         return False
     
-    def _ubuntu_do_install_apache(self):
+    def _ubuntu_do_install_apache(self, string):
         if not apache.apache_install():
             _logger.error('Failed to install Apache. Exiting.')
             return False
@@ -678,9 +680,9 @@
             _logger.warning('Failed make /etc/openerp/apache2/rewrites.')
         if tools.exec_command('cp %s/oerptools/oerp/static/apache/apache-ssl-%s-skeleton /etc/openerp/apache2/ssl-%s-skeleton' % (config.params['oerptools_path'], self._branch, self._branch), as_root=True):
             _logger.warning('Failed copy Apache rewrite skeleton.')
-        if tools.exec_command('sed -i "s#ServerAdmin .*\\$#ServerAdmin [e-mail]\\n\\n\\tInclude /etc/apache2/sites-available/erp#g" /etc/apache2/sites-available/default', as_root=True):
+        if tools.exec_command('sed -i "s#ServerAdmin .*\\$#ServerAdmin [e-mail]\\n\\n\\tInclude /etc/apache2/sites-available/erp#g" /etc/apache2/sites-available/'+string+'default.conf', as_root=True):
             _logger.warning('Failed config Apache site.')
-        if tools.exec_command('sed -i "s#ServerAdmin .*\\$#ServerAdmin [e-mail]\\n\\n\\tInclude /etc/openerp/apache2/rewrites#g" /etc/apache2/sites-available/default-ssl', as_root=True):
+        if tools.exec_command('sed -i "s#ServerAdmin .*\\$#ServerAdmin [e-mail]\\n\\n\\tInclude /etc/openerp/apache2/rewrites#g" /etc/apache2/sites-available/default-ssl.conf', as_root=True):
             _logger.warning('Failed config Apache site.')
         if not apache.apache_restart():
             _logger.warning('Failed restart Apache.')