From af44ea18b5450bcc55c87e27bd7cc0114b1175a5 Mon Sep 17 00:00:00 2001
From: cysnake4713 <cysnake4713@gmail.com>
Date: Fri, 15 Apr 2016 17:47:46 +0800
Subject: [PATCH] [UPD]runbot:Connect Database with master runbot setting, not
 currenct linux user account

---
 runbot/runbot.py | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 runbot/runbot.py

diff --git a/runbot/runbot.py b/runbot/runbot.py
old mode 100644
new mode 100755
index c5890334..8149d6a2
--- a/runbot/runbot.py
+++ b/runbot/runbot.py
@@ -158,8 +158,13 @@ def fqdn():
 def local_pgadmin_cursor():
     cnx = None
     try:
-        cnx = psycopg2.connect("dbname=postgres")
-        cnx.autocommit = True # required for admin commands
+        cnx = psycopg2.connect(database='postgres',
+                               user=config.get('db_user'),
+                               password=config.get('db_password'),
+                               host=config.get('db_host'),
+                               port=config.get('db_port')
+                               )
+        cnx.autocommit = True  # required for admin commands
         yield cnx.cursor()
     finally:
         if cnx: cnx.close()
@@ -595,9 +600,9 @@ def create(self, cr, uid, values, context=None):
 
         # detect duplicate
         domain = [
-            ('repo_id','=',build.repo_id.duplicate_id.id), 
-            ('name', '=', build.name), 
-            ('duplicate_id', '=', False), 
+            ('repo_id','=',build.repo_id.duplicate_id.id),
+            ('name', '=', build.name),
+            ('duplicate_id', '=', False),
             '|', ('result', '=', False), ('result', '!=', 'skipped')
         ]
         duplicate_ids = self.search(cr, uid, domain, context=context)
@@ -868,6 +873,11 @@ def cmd(self, cr, uid, ids, context=None):
                 server_path,
                 "--xmlrpc-port=%d" % build.port,
             ]
+            # add db connection info
+            cmd.append('--db_host=%s' % config.get('db_host'))
+            cmd.append('--db_port=%s' % config.get('db_port'))
+            cmd.append('--db_user=%s' % config.get('db_user'))
+            cmd.append('--db_password=%s' % config.get('db_password'))
             # options
             if grep(build.server("tools/config.py"), "no-xmlrpcs"):
                 cmd.append("--no-xmlrpcs")
@@ -1225,7 +1235,7 @@ def repo(self, repo=None, search='', limit='100', refresh='', **post):
         repo_ids = repo_obj.search(cr, uid, [])
         repos = repo_obj.browse(cr, uid, repo_ids)
         if not repo and repos:
-            repo = repos[0] 
+            repo = repos[0]
 
         context = {
             'repos': repos,