# HG changeset patch # User Nicolas Chauvat # Date 1263047497 -3600 # Node ID deb2dcffb301880e77b0e8505f5fbbe8c3253ae3 # Parent bf2811a17a17b5bcdca0df0b4911ee56d449f63c [cwctl] reset-admin-pwd was failing when db-host was not set diff -r bf2811a17a17 -r deb2dcffb301 server/serverctl.py --- a/server/serverctl.py Fri Jan 08 18:20:03 2010 +0100 +++ b/server/serverctl.py Sat Jan 09 15:31:37 2010 +0100 @@ -30,11 +30,15 @@ """ from getpass import getpass from logilab.common.db import get_connection - dbhost = source['db-host'] + dbhost = source.get('db-host') if dbname is None: dbname = source['db-name'] driver = source['db-driver'] - print '-> connecting to %s database %s@%s' % (driver, dbname, dbhost or 'localhost'), + print '-> connecting to %s database' % driver, + if dbhost: + print '%s@%s' % (dbname, dbhost), + else: + print dbname, if not verbose or (not special_privs and source.get('db-user')): user = source['db-user'] print 'as', user