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

Merge pull request #23 from bwrsandman/patch-3

Browse Source 
[FIX] runbot: nginx field name conflict fixed by renaming `nginx()` to `reload_nginx()`
This commit is contained in:
odony 2014-07-22 23:19:13 +02:00
commit 6128ed42ea
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.reap(cr, uid, build_ids)
def nginx(self, cr, uid, context=None):
def reload_nginx(self, cr, uid, context=None):
settings = {}
settings['port'] = openerp.tools.config['xmlrpc_port']
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)])
self.update(cr, uid, ids)
self.scheduler(cr, uid, ids)
self.nginx(cr, uid)
self.reload_nginx(cr, uid, context=context)
class runbot_branch(osv.osv):
_name = "runbot.branch"