This commit is contained in:
root 2012-10-25 20:00:32 +02:00
parent 46f3dec820
commit 5d0f76773e
2 changed files with 1 additions and 2 deletions

View file

@ -125,7 +125,7 @@ def get_required_args(args, required_args, password=False):
else:
raise Exception #FIX
# Password
if ('password' not in args) and ('password' in required_args) and password:
if not args['password'] and password and 'password' in required_args:
if os.isatty(1):
args['password'] = getpass.getpass(colorize(required_args['password'] + ': ', 'cyan'))
pwd2 = getpass.getpass(colorize('Retype ' + required_args['password'][0].lower() + required_args['password'][1:] + ': ', 'cyan'))

View file

@ -175,7 +175,6 @@ def tools_postinstall(args, connections):
# Initialize YunoHost LDAP base
tools_ldapinit(args, connections)
print(args)
# Change LDAP admin password
tools_adminpw({ 'old' : 'yunohost', 'new' : args['password']})