luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix ProjectResolver to properly signal that it can't retrieve artifacts

This commit is contained in:
Mark Harrah 2010-09-21 22:04:12 -04:00
parent 5b181eea6e
commit 678628741a
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ivy/ProjectResolver.scala
View File

@ -34,22 +34,13 @@ class ProjectResolver(name: String, map: Map[ModuleRevisionId, ModuleDescriptor]
val artifact = DefaultArtifact.newIvyArtifact(revisionId, new Date) val artifact = DefaultArtifact.newIvyArtifact(revisionId, new Date)
val r = new MetadataArtifactDownloadReport(artifact) val r = new MetadataArtifactDownloadReport(artifact)
r.setSearched(false) r.setSearched(false)
r.setDownloadStatus(DownloadStatus.NO) r.setDownloadStatus(DownloadStatus.FAILED)
r r
} }
def findIvyFileRef(dd: DependencyDescriptor, data: ResolveData) = null
// this resolver nevers locates artifacts, only resolves dependencies // this resolver nevers locates artifacts, only resolves dependencies
def exists(artifact: IArtifact) = false def exists(artifact: IArtifact) = false
def locate(artifact: IArtifact) = null def locate(artifact: IArtifact) = null
def notDownloaded(artifact: IArtifact): ArtifactDownloadReport=
{
val r = new ArtifactDownloadReport(artifact)
r.setDownloadStatus(DownloadStatus.NO)
r
}
def download(artifacts: Array[IArtifact], options: DownloadOptions): DownloadReport = def download(artifacts: Array[IArtifact], options: DownloadOptions): DownloadReport =
{ {
val r = new DownloadReport val r = new DownloadReport
@ -57,14 +48,22 @@ class ProjectResolver(name: String, map: Map[ModuleRevisionId, ModuleDescriptor]
r addArtifactReport notDownloaded(artifact) r addArtifactReport notDownloaded(artifact)
r r
} }
def download(artifact: ArtifactOrigin, options: DownloadOptions): ArtifactDownloadReport = def download(artifact: ArtifactOrigin, options: DownloadOptions): ArtifactDownloadReport =
notDownloaded(artifact.getArtifact) notDownloaded(artifact.getArtifact)
def findIvyFileRef(dd: DependencyDescriptor, data: ResolveData) = null
def notDownloaded(artifact: IArtifact): ArtifactDownloadReport=
{
val r = new ArtifactDownloadReport(artifact)
r.setDownloadStatus(DownloadStatus.FAILED)
r
}
// doesn't support publishing // doesn't support publishing
def publish(artifact: IArtifact, src: File, overwrite: Boolean) = error("Publish not supported by ProjectResolver") def publish(artifact: IArtifact, src: File, overwrite: Boolean) = error("Publish not supported by ProjectResolver")
def beginPublishTransaction(module: ModuleRevisionId, overwrite: Boolean) {} def beginPublishTransaction(module: ModuleRevisionId, overwrite: Boolean) {}
def abortPublishTransaction() {} def abortPublishTransaction() {}
def commitPublishTransaction() {} def commitPublishTransaction() {}
def reportFailure() {} def reportFailure() {}
def reportFailure(art: IArtifact) {} def reportFailure(art: IArtifact) {}
@ -73,7 +72,7 @@ class ProjectResolver(name: String, map: Map[ModuleRevisionId, ModuleDescriptor]
def listModules(org: OrganisationEntry) = new Array[ModuleEntry](0) def listModules(org: OrganisationEntry) = new Array[ModuleEntry](0)
def listRevisions(module: ModuleEntry) = new Array[RevisionEntry](0) def listRevisions(module: ModuleEntry) = new Array[RevisionEntry](0)
def getNamespace = Namespace.SYSTEM_NAMESPACE def getNamespace = Namespace.SYSTEM_NAMESPACE
private[this] var settings: Option[ResolverSettings] = None private[this] var settings: Option[ResolverSettings] = None