From 2c9e943daa3fff05f332bcb5b9ae5cebd98454e1 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Fri, 14 Oct 2011 07:51:39 -0400 Subject: [PATCH] require module descriptor in launcher --- launch/Update.scala | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/launch/Update.scala b/launch/Update.scala index 8ae377760..1c734bcda 100644 --- a/launch/Update.scala +++ b/launch/Update.scala @@ -22,7 +22,7 @@ import core.retrieve.{RetrieveEngine, RetrieveOptions} import core.sort.SortEngine import core.settings.IvySettings import plugins.matcher.{ExactPatternMatcher, PatternMatcher} -import plugins.resolver.{ChainResolver, FileSystemResolver, IBiblioResolver, URLResolver} +import plugins.resolver.{BasicResolver, ChainResolver, FileSystemResolver, IBiblioResolver, URLResolver} import util.{DefaultMessageLogger, filter, Message, MessageLoggerEngine, url} import filter.Filter import url.CredentialsStore @@ -228,7 +228,7 @@ final class Update(config: UpdateConfiguration) newDefault.setName("redefined-public") if(repositories.isEmpty) error("No repositories defined.") for(repo <- repositories if includeRepo(repo)) - newDefault.add(toIvyRepository(settings, repo)) + newDefault.add(initializeBasic(toIvyRepository(settings, repo))) configureCache(settings) settings.addResolver(newDefault) settings.setDefaultResolver(newDefault.getName) @@ -334,6 +334,12 @@ final class Update(config: UpdateConfiguration) else mavenResolver("Scala-Tools Maven2 Snapshots Repository", "http://scala-tools.org/repo-snapshots") } + private def initializeBasic(resolver: BasicResolver) = + { + resolver.setDescriptor(BasicResolver.DESCRIPTOR_REQUIRED) + resolver + } + /** Logs the given message to a file and to the console. */ private def log(msg: String) = {