From 48e652436e1220df1de22f20bc94e50f5ecfc5d8 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Fri, 2 Sep 2016 19:23:02 +0200 Subject: [PATCH] [IMP] runbot: support v10-style manifest naming convention --- runbot/runbot.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/runbot/runbot.py b/runbot/runbot.py index f06dd5c3..cedcfe2f 100644 --- a/runbot/runbot.py +++ b/runbot/runbot.py @@ -803,7 +803,8 @@ class runbot_build(osv.osv): if build.repo_id.modules_auto == 'repo': modules_to_test += [ os.path.basename(os.path.dirname(a)) - for a in glob.glob(build.path('*/__openerp__.py')) + for a in (glob.glob(build.path('*/__openerp__.py')) + + glob.glob(build.path('*/__manifest__.py'))) ] _logger.debug("local modules_to_test for build %s: %s", build.dest, modules_to_test) @@ -822,7 +823,8 @@ class runbot_build(osv.osv): # Finally mark all addons to move to openerp/addons modules_to_move += [ os.path.dirname(module) - for module in glob.glob(build.path('*/__openerp__.py')) + for module in (glob.glob(build.path('*/__openerp__.py')) + + glob.glob(build.path('*/__manifest__.py'))) ] # move all addons to server addons path @@ -838,7 +840,8 @@ class runbot_build(osv.osv): available_modules = [ os.path.basename(os.path.dirname(a)) - for a in glob.glob(build.server('addons/*/__openerp__.py')) + for a in (glob.glob(build.server('addons/*/__openerp__.py')) + + glob.glob(build.server('addons/*/__manifest__.py'))) ] if build.repo_id.modules_auto == 'all' or (build.repo_id.modules_auto != 'none' and has_server): modules_to_test += available_modules