cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixes maven_artifact - verify_md5 only called for SNAPSHOT

Browse source 
* fixed https://github.com/ansible/ansible-modules-extras/issues/2066

* fixes https://github.com/ansible/ansible-modules-extras/issues/2066
This commit is contained in:
Emil Bostijancic 2016-04-21 22:02:33 +02:00 committed by René Moser
parent ba74516640
commit 3031105e78
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
packaging/language/maven_artifact.py
View file

@ -54,17 +54,17 @@ options:
required: false required: false
default: latest default: latest
classifier: classifier:
description: description:
- The maven classifier coordinate - The maven classifier coordinate
required: false required: false
default: null default: null
extension: extension:
description: description:
- The maven type/extension coordinate - The maven type/extension coordinate
required: false required: false
default: jar default: jar
repository_url: repository_url:
description: description:
- The URL of the Maven Repository to download from - The URL of the Maven Repository to download from
required: false required: false
default: http://repo1.maven.org/maven2 default: http://repo1.maven.org/maven2
@ -90,7 +90,7 @@ options:
default: present default: present
choices: [present,absent] choices: [present,absent]
validate_certs: validate_certs:
description: description:
- If C(no), SSL certificates will not be validated. This should only be set to C(no) when no other option exists. - If C(no), SSL certificates will not be validated. This should only be set to C(no) when no other option exists.
required: false required: false
default: 'yes' default: 'yes'
@ -202,7 +202,10 @@ class MavenDownloader:
buildNumber = xml.xpath("/metadata/versioning/snapshot/buildNumber/text()")[0] buildNumber = xml.xpath("/metadata/versioning/snapshot/buildNumber/text()")[0]
return self._uri_for_artifact(artifact, artifact.version.replace("SNAPSHOT", timestamp + "-" + buildNumber)) return self._uri_for_artifact(artifact, artifact.version.replace("SNAPSHOT", timestamp + "-" + buildNumber))
else: else:
return self._uri_for_artifact(artifact) if artifact.version == "latest":
artifact.version = self._find_latest_version_available(artifact)
return self._uri_for_artifact(artifact, artifact.version)
def _uri_for_artifact(self, artifact, version=None): def _uri_for_artifact(self, artifact, version=None):
if artifact.is_snapshot() and not version: if artifact.is_snapshot() and not version:
@ -331,11 +334,8 @@ def main():
prev_state = "absent" prev_state = "absent"
if os.path.isdir(dest): if os.path.isdir(dest):
dest = dest + "/" + artifact_id + "-" + version + "." + extension dest = dest + "/" + artifact_id + "-" + version + "." + extension
if os.path.lexists(dest): if os.path.lexists(dest) and downloader.verify_md5(dest, downloader.find_uri_for_artifact(artifact) + '.md5'):
if not artifact.is_snapshot(): prev_state = "present"
prev_state = "present"
elif downloader.verify_md5(dest, downloader.find_uri_for_artifact(artifact) + '.md5'):
prev_state = "present"
else: else:
path = os.path.dirname(dest) path = os.path.dirname(dest)
if not os.path.exists(path): if not os.path.exists(path):