Projet

Général

Profil

0001-ctl-update-delete_tenant-error-message-for-new-db-ar.patch

Frédéric Péters, 24 novembre 2021 15:29

Télécharger (1,5 ko)

Voir les différences: 

Subject: [PATCH] ctl: update delete_tenant error message for new db arg name
 (#58950)


 wcs/ctl/delete_tenant.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
wcs/ctl/delete_tenant.py
65 65 
            if not createdb_cfg:
66 66 
                createdb_cfg = postgresql_cfg
67 67 
                createdb = False
68 
            if 'database' in createdb_cfg:
69 
                createdb_cfg['dbname'] = createdb_cfg.pop('database')
68 
            if 'database' in createdb_cfg or 'dbname' in createdb_cfg:
69 
                createdb_cfg['dbname'] = createdb_cfg.pop('database', createdb_cfg.pop('dbname'))
70 70 
            try:
71 71 
                pgconn = psycopg2.connect(**createdb_cfg)
72 72 
            except psycopg2.Error as e:
......
110 110 
            except psycopg2.Error as e:
111 111 
                print(
112 112 
                    'failed to alter database %s: (%s)'
113 
                    % (createdb_cfg['database'], psycopg2.errorcodes.lookup(e.pgcode)),
113 
                    % (createdb_cfg['dbname'], psycopg2.errorcodes.lookup(e.pgcode)),
114 114 
                    file=sys.stderr,
115 115 
                )
116 116 
                return
117 
-