# HG changeset patch # User Sylvain Thénault # Date 1281108864 -7200 # Node ID 9d83b214066a0af00a4ed36a06d61130d7a21350 # Parent c7a9e25153c2b68f2380430c159bc965538c426d [db-create] fix bug introduced by 6060:353bec342e2a (we ask for user while in non verbose mode) diff -r c7a9e25153c2 -r 9d83b214066a server/serverctl.py --- a/server/serverctl.py Fri Aug 06 17:33:07 2010 +0200 +++ b/server/serverctl.py Fri Aug 06 17:34:24 2010 +0200 @@ -71,13 +71,13 @@ 'on the database:') print special_privs print - default_user = source.get('db-user', os.environ.get('USER', '')) - user = raw_input('Connect as user ? [%r]: ' % default_user) - user = user or default_user - if user == source.get('db-user') and source.get('db-password'): - password = source['db-password'] - else: - password = getpass('password: ') + default_user = source.get('db-user', os.environ.get('USER', '')) + user = raw_input('Connect as user ? [%r]: ' % default_user) + user = user or default_user + if user == source.get('db-user') and source.get('db-password'): + password = source['db-password'] + else: + password = getpass('password: ') else: user = password = None extra_args = source.get('db-extra-arguments')