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

[FIX] runbot: fix percent in format string and typos

Browse Source
This commit is contained in:
Christophe Monniez 2019-12-03 15:02:39 +01:00
parent 9cc46d1d3a
commit 8ab89d2e2f
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
runbot/models/build.py
View File

@ -494,17 +494,17 @@ class runbot_build(models.Model):
additionnal_condition_str = '' additionnal_condition_str = ''
if force is True: if force is True:
def filter_ids(elems, label): def filter_ids(dest_list, label):
for dest in dest_list: for dest in dest_list:
build = self._build_from_dest(dest) build = self._build_from_dest(dest)
if build and build in self: if build and build in self:
yield dest yield dest
elif not build: elif not build:
_logger.debug('%s (%s) skipped because not dest format', label, elem) _logger.debug('%s (%s) skipped because not dest format', label, dest)
_filter = filter_ids _filter = filter_ids
additionnal_conditions = [] additionnal_conditions = []
for _id in self.exists().ids: for _id in self.exists().ids:
additionnal_conditions.append("datname like '%s-%'" % _id) additionnal_conditions.append("datname like '%s-%%'" % _id)
if additionnal_conditions: if additionnal_conditions:
additionnal_condition_str = 'AND (%s)' % ' OR '.join(additionnal_conditions) additionnal_condition_str = 'AND (%s)' % ' OR '.join(additionnal_conditions)
@ -518,6 +518,7 @@ class runbot_build(models.Model):
existing_db = [d[0] for d in local_cr.fetchall()] existing_db = [d[0] for d in local_cr.fetchall()]
for db in _filter(dest_list=existing_db, label='db'): for db in _filter(dest_list=existing_db, label='db'):
self._logger('Removing database')
self._local_pg_dropdb(db) self._local_pg_dropdb(db)
root = self.env['runbot.repo']._root() root = self.env['runbot.repo']._root()
@ -531,6 +532,7 @@ class runbot_build(models.Model):
for dest in dests: for dest in dests:
path = os.path.join(builds_dir, dest) path = os.path.join(builds_dir, dest)
if os.path.isdir(path) and os.path.isabs(path): if os.path.isdir(path) and os.path.isabs(path):
self._logger('Removing build directory')
shutil.rmtree(path) shutil.rmtree(path)
def _find_port(self): def _find_port(self):