summaryrefslogtreecommitdiff
path: root/odoo/http.py
diff options
context:
space:
mode:
authorFabien Meghazi <fme@odoo.com>2017-08-03 17:05:47 +0200
committerFabien Meghazi <fme@odoo.com>2017-08-03 17:06:55 +0200
commit96af2823cba1739cbf1d3484dbd2d5e28e59b8a5 (patch)
treee06ffdab055ec035b4afe3116df206ff539fcd55 /odoo/http.py
parentef5c6615aa0743320814352202bb78232300fe4a (diff)
[FIX] http/db: fix bug introduced in b34e00540e2
b34e00540e2 was not properly checking if db_name option was in use
Diffstat (limited to 'odoo/http.py')
-rw-r--r--odoo/http.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/odoo/http.py b/odoo/http.py
index e66497ccdba..a0da09bb795 100644
--- a/odoo/http.py
+++ b/odoo/http.py
@@ -1491,7 +1491,7 @@ def db_filter(dbs, httprequest=None):
if odoo.tools.config['dbfilter']:
r = odoo.tools.config['dbfilter'].replace('%h', h).replace('%d', d)
dbs = [i for i in dbs if re.match(r, i)]
- else:
+ elif odoo.tools.config['db_name']:
# In case --db-filter is not provided and --database is passed, Odoo will
# use the value of --database as a comma seperated list of exposed databases.
exposed_dbs = set(db.strip() for db in odoo.tools.config['db_name'].split(','))