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

[REF][runbot] Add validation of module duplicate

Browse Source
This commit is contained in:
Moises Lopez 2014-07-24 13:39:15 -05:00 committed by Sandy Carter
parent 071720433c
commit be765dd6ef
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
runbot/runbot.py
View File

@ -586,6 +586,7 @@ class runbot_build(osv.osv):
shutil.move(build.path('bin'), build.server()) shutil.move(build.path('bin'), build.server())
# fallback for addons-only community/project branches # fallback for addons-only community/project branches
additional_modules = []
if not os.path.isfile(build.server('__init__.py')): if not os.path.isfile(build.server('__init__.py')):
# Use modules to test previously configured in the repository # Use modules to test previously configured in the repository
modules_to_test = build.repo_id.modules modules_to_test = build.repo_id.modules
@ -599,13 +600,22 @@ class runbot_build(osv.osv):
for extra_repo in build.repo_id.dependency_ids: for extra_repo in build.repo_id.dependency_ids:
closest_name = build.get_closest_branch_name(extra_repo.id) closest_name = build.get_closest_branch_name(extra_repo.id)
extra_repo.git_export(closest_name, build.path()) extra_repo.git_export(closest_name, build.path())
# Finally move all addons to openerp/addons # Finally mark all addons to move to openerp/addons
for module in glob.glob(build.path('*/__openerp__.py')): additional_modules += [
shutil.move(os.path.dirname(module), build.path('openerp/addons')) os.path.dirname(module)
for module in glob.glob(build.path('*/__openerp__.py'))
]
# move all addons to server addons path # move all addons to server addons path
for i in glob.glob(build.path('addons/*')): for module in set(glob.glob(build.path('addons/*')) + additional_modules):
shutil.move(i, build.server('addons')) basename = os.path.basename(module)
if not os.path.exists(build.server('addons', basename)):
shutil.move(module, build.server('addons'))
else:
build._log(
'Building environment',
'You have duplicate modules in your branches "%s"' % basename
)
def pg_dropdb(self, cr, uid, dbname): def pg_dropdb(self, cr, uid, dbname):
pid_col = 'pid' if cr._cnx.server_version >= 90200 else 'procpid' pid_col = 'pid' if cr._cnx.server_version >= 90200 else 'procpid'