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

Merge pull request #1300 from cunei/wip-fix-ivy-move 

Do not attempt to publish if no artifacts are present
This commit is contained in:
Josh Suereth 2014-04-30 14:41:51 -04:00
parent 2a0fef6700 350619545d
commit c855dbd854
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ivy/src/main/scala/sbt/IvyActions.scala
View File

@ -255,16 +255,18 @@ object IvyActions
def publish(module: ModuleDescriptor, artifacts: Seq[(IArtifact, File)], resolver: DependencyResolver, overwrite: Boolean): Unit = def publish(module: ModuleDescriptor, artifacts: Seq[(IArtifact, File)], resolver: DependencyResolver, overwrite: Boolean): Unit =
{ {
checkFilesPresent(artifacts) if (artifacts.nonEmpty) {
try { checkFilesPresent(artifacts)
resolver.beginPublishTransaction(module.getModuleRevisionId(), overwrite); try {
for( (artifact, file) <- artifacts) resolver.beginPublishTransaction(module.getModuleRevisionId(), overwrite);
resolver.publish(artifact, file, overwrite) for( (artifact, file) <- artifacts)
resolver.commitPublishTransaction() resolver.publish(artifact, file, overwrite)
} catch { resolver.commitPublishTransaction()
case e: Throwable => } catch {
try { resolver.abortPublishTransaction() } case e: Throwable =>
finally { throw e } try { resolver.abortPublishTransaction() }
finally { throw e }
}
} }
} }
private[this] def checkFilesPresent(artifacts: Seq[(IArtifact, File)]) private[this] def checkFilesPresent(artifacts: Seq[(IArtifact, File)])