wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle binary files when scanning metadata in python 3 (#53773) (#53784)

Browse source 
(cherry picked from commit c2466c545b)
This commit is contained in:
Jordan Borean 2019-03-19 05:54:30 +10:00 committed by Toshio Kuratomi
parent 4840952f3d
commit 799b51ba0b
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
test/runner/lib/target.py
View file

@ -363,8 +363,12 @@ def analyze_integration_target_dependencies(integration_targets):
for meta_path in meta_paths:
if os.path.exists(meta_path):
with open(meta_path, 'r') as meta_fd:
meta_lines = meta_fd.read().splitlines()
with open(meta_path, 'rb') as meta_fd:
# try and decode the file as a utf-8 string, skip if it contains invalid chars (binary file)
try:
meta_lines = meta_fd.read().decode('utf-8').splitlines()
except UnicodeDecodeError:
continue
for meta_line in meta_lines:
if re.search(r'^ *#.*$', meta_line):