diff --git a/runbot/models/batch.py b/runbot/models/batch.py index 5cf031a2..5f022810 100644 --- a/runbot/models/batch.py +++ b/runbot/models/batch.py @@ -259,7 +259,7 @@ class Batch(models.Model): used_branches = _fill_missing({branch: branch.head for branch in foreign_bundles.mapped('branch_ids').sorted('is_pr', reverse=True)}, 'head') if used_branches: commits = ', '.join([f'[{branch.remote_id.repo_id.name}]({branch.bundle_id.name})' for branch in used_branches]) - self._log(f'Found {len(used_branches)} commits in foreigh repo: {commits}') + self._log(f'Found {len(used_branches)} commits in foreign repo: {commits}') batch = self.base_reference_batch_id if batch: diff --git a/runbot/models/bundle.py b/runbot/models/bundle.py index e6681062..1feb9747 100644 --- a/runbot/models/bundle.py +++ b/runbot/models/bundle.py @@ -21,7 +21,7 @@ class Bundle(models.Model): no_build = fields.Boolean('No build') no_auto_run = fields.Boolean('No run') build_all = fields.Boolean('Force all triggers') - always_use_foreign = fields.Boolean('Use foreigh bundle', help='By default, check for the same bundle name in another project to fill missing commits.', default=lambda self: self.project_id.always_use_foreign) + always_use_foreign = fields.Boolean('Use foreign bundle', help='By default, check for the same bundle name in another project to fill missing commits.', default=lambda self: self.project_id.always_use_foreign) modules = fields.Char("Modules to install", help="Comma-separated list of modules to install and test.") batch_ids = fields.One2many('runbot.batch', 'bundle_id') diff --git a/runbot/models/project.py b/runbot/models/project.py index 79acf60a..8caeb29b 100644 --- a/runbot/models/project.py +++ b/runbot/models/project.py @@ -17,7 +17,7 @@ class Project(models.Model): token = fields.Char("Github token", groups="runbot.group_runbot_admin") master_bundle_id = fields.Many2one('runbot.bundle', string='Master bundle') dummy_bundle_id = fields.Many2one('runbot.bundle', string='Dummy bundle') - always_use_foreign = fields.Boolean('Use foreigh bundle', help='By default, check for the same bundle name in another project to fill missing commits.', default=False) + always_use_foreign = fields.Boolean('Use foreign bundle', help='By default, check for the same bundle name in another project to fill missing commits.', default=False) @api.model_create_multi