ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

maven_artifact: fix broken import (#33749)

Browse source 
* Fail when lxml isn't available

* whole project requires Python >= 2.6
This commit is contained in:
Pilou 2017-12-13 14:54:05 +01:00 committed by John R Barker
parent 99abe24d74
commit 02e965ba20
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/ansible/modules/packaging/language/maven_artifact.py
View file

@ -28,7 +28,6 @@ description:
version if one is not available. version if one is not available.
author: "Chris Schmidt (@chrisisbeef)" author: "Chris Schmidt (@chrisisbeef)"
requirements: requirements:
- "python >= 2.6"
- lxml - lxml
- boto if using a S3 repository (s3://...) - boto if using a S3 repository (s3://...)
options: options:
@ -155,7 +154,11 @@ import os
import posixpath import posixpath
import sys import sys
from lxml import etree try:
from lxml import etree
HAS_LXML_ETREE = True
except ImportError:
HAS_LXML_ETREE = False
try: try:
import boto3 import boto3
@ -419,6 +422,9 @@ def main():
add_file_common_args=True add_file_common_args=True
) )
if not HAS_LXML_ETREE:
module.fail_json(msg='module requires the lxml python library installed on the managed machine')
repository_url = module.params["repository_url"] repository_url = module.params["repository_url"]
if not repository_url: if not repository_url:
repository_url = "http://repo1.maven.org/maven2" repository_url = "http://repo1.maven.org/maven2"

1
test/sanity/import/skip.txt
View file

@ -32,6 +32,5 @@ lib/ansible/modules/network/lenovo/cnos_template.py
lib/ansible/modules/network/lenovo/cnos_vlag.py lib/ansible/modules/network/lenovo/cnos_vlag.py
lib/ansible/modules/network/lenovo/cnos_vlan.py lib/ansible/modules/network/lenovo/cnos_vlan.py
lib/ansible/modules/network/nxos/nxos_file_copy.py lib/ansible/modules/network/nxos/nxos_file_copy.py
lib/ansible/modules/packaging/language/maven_artifact.py
lib/ansible/modules/packaging/os/yum_repository.py lib/ansible/modules/packaging/os/yum_repository.py
lib/ansible/modules/system/hostname.py lib/ansible/modules/system/hostname.py