Merge :plugin-repositories into :repositories before loading plugins.

technomancy · Apr 23, 2014 · f5305ab · f5305ab
1 parent c9f64ea
commit f5305ab
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/leiningen-core/src/leiningen/core/classpath.clj b/leiningen-core/src/leiningen/core/classpath.clj
@@ -21,9 +21,8 @@
         (try ((resolve 'leiningen.core.project/read) project [:default])
              (catch Exception e
                (throw (Exception. (format "Problem loading %s" project) e)))))
-      (println
-       "WARN ignoring checkouts directory" dep
-       "as it does not contain a project.clj file."))))
+      (println "WARN ignoring checkouts directory" dep
+               "as it does not contain a project.clj file."))))
 
 (alter-var-root #'read-dependency-project memoize)
 

diff --git a/leiningen-core/src/leiningen/core/project.clj b/leiningen-core/src/leiningen/core/project.clj
@@ -597,9 +597,11 @@
   ([project key]
      (when (seq (get project key))
        (ensure-dynamic-classloader)
-       (classpath/resolve-dependencies key (assoc project :repositories
-                                                  (:plugin-repositories project))
-                                       :add-classpath? true))
+       (let [repos-project (meta-merge project
+                                       (assoc project :repositories
+                                              (:plugin-repositories project)))]
+         (classpath/resolve-dependencies key repos-project
+                                         :add-classpath? true)))
      (doseq [wagon-file (-> (.getContextClassLoader (Thread/currentThread))
                             (.getResources "leiningen/wagons.clj")
                             (enumeration-seq))