External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-12 11:57:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

cli: fix a bug introduced in @ file support

Browse Source
This commit is contained in:
Ryan Petrello
2019-09-03 21:31:46 -04:00
parent ba8b876dd3
commit 70989ca616
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awxkit/awxkit/cli/options.py
View File

@@ -6,6 +6,7 @@ import re
import yaml import yaml
from distutils.util import strtobool from distutils.util import strtobool
import six
from .custom import CustomAction from .custom import CustomAction
from .format import add_output_formatting_arguments from .format import add_output_formatting_arguments
@@ -146,7 +147,7 @@ class ResourceOptionsParser(object):
for k, v in parsed.items(): for k, v in parsed.items():
# add support for file reading at top-level JSON keys # add support for file reading at top-level JSON keys
# (to make things like SSH key data easier to work with) # (to make things like SSH key data easier to work with)
if v.startswith('@'): if isinstance(v, six.text_type) and v.startswith('@'):
path = os.path.expanduser(v[1:]) path = os.path.expanduser(v[1:])
if os.path.exists(path): if os.path.exists(path):
parsed[k] = open(path).read() parsed[k] = open(path).read()