From b8448fdb9026f6de03087d431a2f489cc9dcf428 Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Thu, 25 May 2017 12:21:03 -0400 Subject: [PATCH] path cli options now resolve relative paths to cli --- lib/ansible/cli/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/ansible/cli/__init__.py b/lib/ansible/cli/__init__.py index ed2599cc66..40beee3192 100644 --- a/lib/ansible/cli/__init__.py +++ b/lib/ansible/cli/__init__.py @@ -320,12 +320,12 @@ class CLI(with_metaclass(ABCMeta, object)): parser.add_option('--ask-vault-pass', default=C.DEFAULT_ASK_VAULT_PASS, dest='ask_vault_pass', action='store_true', help='ask for vault password') parser.add_option('--vault-password-file', default=C.DEFAULT_VAULT_PASSWORD_FILE, dest='vault_password_file', - help="vault password file", action="callback", callback=CLI.expand_tilde, type='string') + help="vault password file", action="callback", callback=CLI.unfrack_path, type='string') 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='string') + help="new vault password file for rekey", action="callback", callback=CLI.unfrack_path, type='string') parser.add_option('--output', default=None, dest='output_file', help='output file name for encrypt or decrypt; use - for stdout', - action="callback", callback=CLI.expand_tilde, type='string') + action="callback", callback=CLI.unfrack_path, type='string') if subset_opts: parser.add_option('-t', '--tags', dest='tags', default=[], action='append',