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

[FIX] runbot: install explictly set modules, even if they are blacklisted

Browse Source
This commit is contained in:
Christophe Simonis 2015-07-24 19:18:08 +02:00
parent 2e01744b0d
commit 491151d251
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
runbot/runbot.py
View File

@ -302,7 +302,6 @@ class runbot_repo(osv.osv):
'committer_email': committer_email,
'subject': subject,
'date': dateutil.parser.parse(date[:19]),
'modules': ','.join(filter(None, [branch.repo_id.modules, branch.modules])),
}
if not branch.sticky:
@ -661,12 +660,15 @@ class runbot_build(osv.osv):
return build.path('odoo', *l)
return build.path('openerp', *l)
def filter_modules(self, cr, uid, modules, available_modules):
def filter_modules(self, cr, uid, modules, available_modules, explicit_modules):
blacklist_modules = set(['auth_ldap', 'document_ftp', 'base_gengo',
'website_gengo', 'website_instantclick'])
mod_filter = lambda m: (not m.startswith(('hw_', 'theme_'))
and m not in blacklist_modules
and m in available_modules)
mod_filter = lambda m: (
m in available_modules and
(m in explicit_modules or (not m.startswith(('hw_', 'theme_'))
and m not in blacklist_modules))
)
return uniq_list(filter(mod_filter, modules))
def checkout(self, cr, uid, ids, context=None):
@ -689,10 +691,10 @@ class runbot_build(osv.osv):
# build complete set of modules to install
modules_to_move = []
modules_to_test = ((build.modules or '') + ',' +
(build.branch_id.modules or '') + ',' +
modules_to_test = ((build.branch_id.modules or '') + ',' +
(build.repo_id.modules or ''))
modules_to_test = filter(None, modules_to_test.split(','))
explicit_modules = set(modules_to_test)
_logger.debug("manual modules_to_test for build %s: %s", build.dest, modules_to_test)
if not has_server:
@ -731,7 +733,8 @@ class runbot_build(osv.osv):
if build.repo_id.modules_auto == 'all' or (build.repo_id.modules_auto != 'none' and has_server):
modules_to_test += available_modules
modules_to_test = self.filter_modules(cr, uid, modules_to_test, set(available_modules))
modules_to_test = self.filter_modules(cr, uid, modules_to_test,
set(available_modules), explicit_modules)
_logger.debug("modules_to_test for build %s: %s", build.dest, modules_to_test)
build.write({'modules': ','.join(modules_to_test)})