From 6ee6d813c5cb5824712aa9b8587930ffc5fe1b86 Mon Sep 17 00:00:00 2001
From: Alexandre Archambault <alexandre.archambault@gmail.com>
Date: Sun, 29 Nov 2015 23:51:56 +0100
Subject: [PATCH] Add back fetch-local-first logic

---
 cli/src/main/scala/coursier/cli/Helper.scala | 6 +++++-
 files/src/main/scala/coursier/Fetch.scala    | 7 +++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/cli/src/main/scala/coursier/cli/Helper.scala b/cli/src/main/scala/coursier/cli/Helper.scala
index cb7a53741..db82754d4 100644
--- a/cli/src/main/scala/coursier/cli/Helper.scala
+++ b/cli/src/main/scala/coursier/cli/Helper.scala
@@ -201,7 +201,11 @@ class Helper(
     else
       None
   logger.foreach(_.init())
-  val fetchQuiet = coursier.Fetch(repositories, files.fetch(logger = logger))
+  val fetchQuiet = coursier.Fetch(
+    repositories,
+    files.fetch(logger = logger)(cachePolicy = CachePolicy.LocalOnly), // local files get the priority
+    files.fetch(logger = logger)
+  )
   val fetch0 =
     if (verbose0 <= 0) fetchQuiet
     else {
diff --git a/files/src/main/scala/coursier/Fetch.scala b/files/src/main/scala/coursier/Fetch.scala
index 3e7d220d5..2c0ab0e81 100644
--- a/files/src/main/scala/coursier/Fetch.scala
+++ b/files/src/main/scala/coursier/Fetch.scala
@@ -11,12 +11,15 @@ object Fetch {
 
   def apply(
     repositories: Seq[core.Repository],
-    fetch: Repository.Fetch[Task]
+    fetch: Repository.Fetch[Task],
+    extra: Repository.Fetch[Task]*
   ): ResolutionProcess.Fetch[Task] = {
 
     modVers => Task.gatherUnordered(
       modVers.map { case (module, version) =>
-        Repository.find(repositories, module, version, fetch)
+        def get(fetch: Repository.Fetch[Task]) =
+          Repository.find(repositories, module, version, fetch)
+        (get(fetch) /: extra)(_ orElse get(_))
           .run
           .map((module, version) -> _)
       }