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

Proposed by Carlos Vásquez (ClearCorp)
Status: Merged
Merged at revision: 429
Proposed branch: lp:~cv.clearcorp/oerptools/oerptools
Merge into: lp:oerptools
Diff against target: 12 lines (+1/-1)
1 file modified
oerptools/oerp/ (+1/-1)
To merge this branch: bzr merge lp:~cv.clearcorp/oerptools/oerptools
Reviewer Review Type Date Requested Status
ClearCorp drivers Pending
Review via email:

Commit message

[FIX] erase the missing variable 'string' when installing oerp

Description of the change

Erase the missing variable 'string' when installing oerp

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/'
2--- oerptools/oerp/ 2014-04-14 22:22:02 +0000
3+++ oerptools/oerp/ 2014-04-16 18:36:35 +0000
4@@ -677,7 +677,7 @@
5 _logger.warning('Failed make /etc/openerp/apache2/rewrites.')
6 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):
7 _logger.warning('Failed copy Apache rewrite skeleton.')
8- if tools.exec_command('sed -i "s#ServerAdmin .*\\$#ServerAdmin\\n\\n\\tInclude /etc/apache2/sites-available/erp#g" /etc/apache2/sites-available/'+string+'default.conf', as_root=True):
9+ if tools.exec_command('sed -i "s#ServerAdmin .*\\$#ServerAdmin\\n\\n\\tInclude /etc/apache2/sites-available/erp#g" /etc/apache2/sites-available/000-default.conf', as_root=True):
10 _logger.warning('Failed config Apache site.')
11 if tools.exec_command('sed -i "s#ServerAdmin .*\\$#ServerAdmin\\n\\n\\tInclude /etc/openerp/apache2/rewrites#g" /etc/apache2/sites-available/default-ssl.conf', as_root=True):
12 _logger.warning('Failed config Apache site.')


People subscribed via source and target branches