valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #46130 from areaxx/develop

Browse Source 
[#46028] strictly separate extension with and without classifier
This commit is contained in:
Nicole Thomas 2018-02-23 14:11:31 -05:00 committed by GitHub
commit 803138f5e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/modules/artifactory.py
View File

@ -388,10 +388,11 @@ def _get_snapshot_version_metadata(artifactory_url, repository, group_id, artifa
for snapshot_version in snapshot_versions: for snapshot_version in snapshot_versions:
extension = snapshot_version.find('extension').text extension = snapshot_version.find('extension').text
value = snapshot_version.find('value').text value = snapshot_version.find('value').text
extension_version_dict[extension] = value
if snapshot_version.find('classifier') is not None: if snapshot_version.find('classifier') is not None:
classifier = snapshot_version.find('classifier').text classifier = snapshot_version.find('classifier').text
extension_version_dict[extension + ':' + classifier] = value extension_version_dict[extension + ':' + classifier] = value
else:
extension_version_dict[extension] = value
return { return {
'snapshot_versions': extension_version_dict 'snapshot_versions': extension_version_dict