fixed rekey password handling

This commit is contained in:
Brian Coca 2015-10-31 14:12:36 -04:00
parent 00bc74404a
commit d341ba14a5
2 changed files with 7 additions and 10 deletions

View file

@ -95,9 +95,9 @@ class VaultCLI(CLI):
else:
newpass = False
rekey = False
if self.options.new_vault_password_file:
newpass = self.action in ['create', 'rekey', 'encrypt']
rekey = self.action == 'rekey'
if not self.options.new_vault_password_file:
newpass = (self.action in ['create', 'rekey', 'encrypt'])
rekey = (self.action == 'rekey')
self.vault_pass, self.new_vault_pass = self.ask_vault_passwords(ask_new_vault_pass=newpass, rekey=rekey)
if self.options.new_vault_password_file: