[MERGE] forward port branch saas-11 up to 3a2147d

1 files changed, 8 insertions, 9 deletions

diff --git a/openerp/cli/server.py b/openerp/cli/server.py
index 0e40848c64f..92162b73905 100644
--- a/openerp/cli/server.py
+++ b/openerp/cli/server.py
@@ -128,11 +128,14 @@ def main(args):
     # bit overkill, but better safe than sorry I guess
     csv.field_size_limit(500 * 1024 * 1024)
 
-    if config["db_name"]:
-        try:
-            openerp.service.db._create_empty_database(config["db_name"])
-        except openerp.service.db.DatabaseExists:
-            pass
+    preload = []
+    if config['db_name']:
+        preload = config['db_name'].split(',')
+        for db_name in preload:
+            try:
+                openerp.service.db._create_empty_database(db_name)
+            except openerp.service.db.DatabaseExists:
+                pass
 
     if config["translate_out"]:
         export_translation()
@@ -147,10 +150,6 @@ def main(args):
     if config['workers']:
         openerp.multi_process = True
 
-    preload = []
-    if config['db_name']:
-        preload = config['db_name'].split(',')
-
     stop = config["stop_after_init"]
 
     setup_pid_file()