0001-ctl-update-delete_tenant-error-message-for-new-db-ar.patch
wcs/ctl/delete_tenant.py | ||
---|---|---|
78 | 78 | |
79 | 79 |
pgconn.set_isolation_level(psycopg2.extensions.ISOLATION_LEVEL_AUTOCOMMIT) |
80 | 80 |
cur = pgconn.cursor() |
81 |
dbname = postgresql_cfg['database'] |
|
81 | 82 |
try: |
82 |
dbname = pub.cfg['postgresql']['database'] |
|
83 | 83 |
if createdb: |
84 | 84 |
if options.force_drop: |
85 | 85 |
cur.execute('DROP DATABASE %s' % dbname) |
... | ... | |
109 | 109 | |
110 | 110 |
except psycopg2.Error as e: |
111 | 111 |
print( |
112 |
'failed to alter database %s: (%s)' |
|
113 |
% (createdb_cfg['database'], psycopg2.errorcodes.lookup(e.pgcode)), |
|
112 |
'failed to alter database %s: (%s)' % (dbname, psycopg2.errorcodes.lookup(e.pgcode)), |
|
114 | 113 |
file=sys.stderr, |
115 | 114 |
) |
116 | 115 |
return |
117 |
- |