mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Add a whitelist for checking for six. Use it for digital_ocean.py
This commit is contained in:
parent
9f9a960ceb
commit
6a61b6d431
1 changed files with 6 additions and 1 deletions
|
@ -2,8 +2,13 @@
|
|||
|
||||
# Do we want to check dynamic inventory, bin, etc?
|
||||
BASEDIR=${1-"lib"}
|
||||
# REGEX of individual files where the import of six is not a problem
|
||||
# digital_ocean is checking for six because dopy doesn't specify the
|
||||
# requirement on six so it needs to try importing six to give the correct error
|
||||
# message
|
||||
WHITELIST='(lib/ansible/modules/core/cloud/digital_ocean/digital_ocean.py)'
|
||||
|
||||
SIX_USERS=$(find "$BASEDIR" -name '*.py' -exec grep -wH six \{\} \;|grep import |grep -v ansible.compat| grep -v ansible.module_utils.six)
|
||||
SIX_USERS=$(find "$BASEDIR" -name '*.py' -exec grep -wH six \{\} \;|grep import |grep -v ansible.compat| grep -v ansible.module_utils.six| egrep -v "^$WHITELIST:")
|
||||
if test -n "$SIX_USERS" ; then
|
||||
printf "$SIX_USERS"
|
||||
exit 1
|
||||
|
|
Loading…
Reference in a new issue