yogsototh/leiningen
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't meta-merge a project into itself.

Browse source 
Should fix #1555.
This commit is contained in:
Phil Hagelberg 2014-06-10 12:13:38 -07:00
parent da00e75685
commit da2e50042f
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
leiningen-core/src/leiningen/core/project.clj
View file

@ -628,9 +628,8 @@
([project key]
(when (seq (get project key))
(ensure-dynamic-classloader)
(let [repos-project (meta-merge project
(assoc project :repositories
(:plugin-repositories project)))]
(let [repos-project (update-in project [:repositories] meta-merge
(:plugin-repositories project))]
(classpath/resolve-dependencies key repos-project
:add-classpath? true)))
(doseq [wagon-file (-> (.getContextClassLoader (Thread/currentThread))