NextERP/runbot
5
0
Fork 0
mirror of https://github.com/odoo/runbot.git synced 2025-03-27 13:25:47 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix nginx field-function ambiguity

Browse Source
This commit is contained in:
Sandy 2014-07-15 14:34:45 -04:00 committed by Sandy Carter
parent ea0e1406a6
commit 793ba31eca
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
runbot/runbot.py
View File

@ -330,7 +330,7 @@ class runbot_repo(osv.osv):
Build.terminate(cr, uid, build_ids[running_max:]) Build.terminate(cr, uid, build_ids[running_max:])
Build.reap(cr, uid, build_ids) Build.reap(cr, uid, build_ids)
def nginx(self, cr, uid, context=None): def reload_nginx(self, cr, uid, context=None):
settings = {} settings = {}
settings['port'] = openerp.tools.config['xmlrpc_port'] settings['port'] = openerp.tools.config['xmlrpc_port']
nginx_dir = os.path.join(self.root(cr, uid), 'nginx') nginx_dir = os.path.join(self.root(cr, uid), 'nginx')
@ -362,7 +362,7 @@ class runbot_repo(osv.osv):
ids = self.search(cr, uid, [('auto', '=', True)]) ids = self.search(cr, uid, [('auto', '=', True)])
self.update(cr, uid, ids) self.update(cr, uid, ids)
self.scheduler(cr, uid, ids) self.scheduler(cr, uid, ids)
self.nginx(cr, uid) self.reload_nginx(cr, uid, context=context)
class runbot_branch(osv.osv): class runbot_branch(osv.osv):
_name = "runbot.branch" _name = "runbot.branch"