From 793ba31eca937486ab6c6fad1861968bc2c1a699 Mon Sep 17 00:00:00 2001 From: Sandy Date: Tue, 15 Jul 2014 14:34:45 -0400 Subject: [PATCH] Fix nginx field-function ambiguity --- runbot/runbot.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runbot/runbot.py b/runbot/runbot.py index 451dad13..37cb8562 100644 --- a/runbot/runbot.py +++ b/runbot/runbot.py @@ -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"