[MERGE] forward port branch 10.0 up to 1e64a88cd3d

1 files changed, 11 insertions, 0 deletions

diff --git a/odoo/cli/server.py b/odoo/cli/server.py
index afb172b7f3c..180efcfb70f 100644
--- a/odoo/cli/server.py
+++ b/odoo/cli/server.py
@@ -21,6 +21,8 @@ import threading
 import traceback
 import time
 
+from psycopg2 import ProgrammingError, errorcodes
+
 import odoo
 
 from . import Command
@@ -136,6 +138,15 @@ def main(args):
         for db_name in preload:
             try:
                 odoo.service.db._create_empty_database(db_name)
+            except ProgrammingError as err:
+                if err.pgcode == errorcodes.INSUFFICIENT_PRIVILEGE:
+                    # We use an INFO loglevel on purpose in order to avoid
+                    # reporting unnecessary warnings on build environment
+                    # using restricted database access.
+                    _logger.info("Could not determine if database %s exists, "
+                                 "skipping auto-creation: %s", db_name, err)
+                else:
+                    raise err
             except odoo.service.db.DatabaseExists:
                 pass