opendev/gerrit
Code Issues Proposed changes

Merge "Buck: Support download of artifacts with classifier"

Browse Source
This commit is contained in:
David Pursehouse
2015-03-06 05:36:58 +00:00
committed by Gerrit Code Review
parent 0bcc05e9aa 371030566b
commit fa38ab33cf
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/maven.defs
View File

@@ -46,9 +46,14 @@ def maven_jar(
from os import path from os import path
parts = id.split(':') parts = id.split(':')
if len(parts) != 3: if len(parts) not in [3, 4]:
raise NameError('expected id="groupId:artifactId:version"') raise NameError('%s:\nexpected id="groupId:artifactId:version[:classifier]"'
group, artifact, version = parts % id)
if len(parts) == 4:
group, artifact, version, classifier = parts
else:
group, artifact, version = parts
classifier = None
# SNAPSHOT artifacts are handled differently on Google storage bucket: # SNAPSHOT artifacts are handled differently on Google storage bucket:
# 'SNAPSHOT' is discarded from the directory name. However on other # 'SNAPSHOT' is discarded from the directory name. However on other
@@ -62,7 +67,11 @@ def maven_jar(
else: else:
file_version = version file_version = version
if classifier is not None:
file_version += '-' + classifier
jar = path.join(name, artifact.lower() + '-' + file_version) jar = path.join(name, artifact.lower() + '-' + file_version)
url = '/'.join([ url = '/'.join([
repository, repository,
group.replace('.', '/'), artifact, version, group.replace('.', '/'), artifact, version,