Permalink
Browse files

Merge pull request #166 from acsone/8.0-fix-dbfilter-sbi

[FIX] ignore dbfilter containing %d or %h, fixes #58
  • Loading branch information...
guewen committed Jan 4, 2016
2 parents d4bc8af + 2290696 commit b1876197b502204177af4aac9b35870d6846898a
Showing with 2 additions and 2 deletions.
  1. +1 −1 connector/jobrunner/runner.py
  2. +1 −1 connector/queue/worker.py
@@ -266,7 +266,7 @@ def get_db_names(self):
else:
db_names = openerp.service.db.exp_list(True)
dbfilter = openerp.tools.config['dbfilter']
if dbfilter:
if dbfilter and '%d' not in dbfilter and '%h' not in dbfilter:
db_names = [d for d in db_names if re.match(dbfilter, d)]
return db_names
@@ -262,7 +262,7 @@ def available_db_names():
else:
db_names = db.exp_list(True)
dbfilter = config['dbfilter']
if dbfilter and db_names:
if dbfilter and '%d' not in dbfilter and '%h' not in dbfilter:
db_names = [d for d in db_names if re.match(dbfilter, d)]
available_db_names = []
for db_name in db_names:

0 comments on commit b187619

Please sign in to comment.