Odoo Server (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-server/6.0-opw-576812-cto into lp:openobject-server/6.0

  1. 6.0-opw-576812-cto
  2. Merge into 6.0
Proposed by Samus CTO (OpenERP)
Status: Rejected
Rejected by: Vo Minh Thu
Proposed branch: lp:~openerp-dev/openobject-server/6.0-opw-576812-cto
Merge into: lp:openobject-server/6.0
Diff against target: 21 lines (+2/-2)
1 file modified
bin/service/web_services.py (+2/-2)
To merge this branch: bzr merge lp:~openerp-dev/openobject-server/6.0-opw-576812-cto
Reviewer Review Type Date Requested Status
Naresh(OpenERP) (community) Approve
Review via email: mp+114625@code.launchpad.net

Description of the change

issue id = 576812

Change the pg_dump/pg_restore hard coded strings by the result of tools.misc.find_pg_tool

To post a comment you must log in.
Revision history for this message
Naresh(OpenERP) (nch-openerp) :
review: Approve
Revision history for this message
Vo Minh Thu (thu) wrote :

The call to find_pg_tool() is already done by exec_pg_command_pipe() (called a few lines below the modified lines).

Unmerged revisions

3631. By Samus CTO (OpenERP)

[FIX] Backup & Restore find pg tools by using tools.misc.find_pg_tool

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'bin/service/web_services.py'
--- bin/service/web_services.py 2011-08-19 13:32:08 +0000
+++ bin/service/web_services.py 2012-07-12 12:23:46 +0000
@@ -187,7 +187,7 @@
187187
188 self._set_pg_psw_env_var()188 self._set_pg_psw_env_var()
189189
190 cmd = ['pg_dump', '--format=c', '--no-owner']190 cmd = [tools.misc.find_pg_tool('pg_dump'), '--format=c', '--no-owner']
191 if tools.config['db_user']:191 if tools.config['db_user']:
192 cmd.append('--username=' + tools.config['db_user'])192 cmd.append('--username=' + tools.config['db_user'])
193 if tools.config['db_host']:193 if tools.config['db_host']:
@@ -223,7 +223,7 @@
223223
224 self._create_empty_database(db_name)224 self._create_empty_database(db_name)
225225
226 cmd = ['pg_restore', '--no-owner']226 cmd = [tools.misc.find_pg_tool('pg_restore'), '--no-owner']
227 if tools.config['db_user']:227 if tools.config['db_user']:
228 cmd.append('--username=' + tools.config['db_user'])228 cmd.append('--username=' + tools.config['db_user'])
229 if tools.config['db_host']:229 if tools.config['db_host']: