Merge pull request #13402 from amenonsen/expandpath

Use CLI.expand_tilde also for the vault --output file
This commit is contained in:
Brian Coca 2015-12-02 09:23:46 -08:00
commit 7708661270

View file

@ -250,7 +250,8 @@ class CLI(object):
parser.add_option('--new-vault-password-file', dest='new_vault_password_file', parser.add_option('--new-vault-password-file', dest='new_vault_password_file',
help="new vault password file for rekey", action="callback", callback=CLI.expand_tilde, type=str) help="new vault password file for rekey", action="callback", callback=CLI.expand_tilde, type=str)
parser.add_option('--output', default=None, dest='output_file', parser.add_option('--output', default=None, dest='output_file',
help='output file name for encrypt or decrypt; use - for stdout') help='output file name for encrypt or decrypt; use - for stdout',
action="callback", callback=CLI.expand_tilde, type=str)
if subset_opts: if subset_opts:
parser.add_option('-t', '--tags', dest='tags', default='all', parser.add_option('-t', '--tags', dest='tags', default='all',