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

Merge pull request #1504 from jcrossley3/1498

Browse source 
Prevent NPE when pedantic encounters dupe top-level deps to fix #1498
This commit is contained in:
Phil Hagelberg 2014-04-22 18:08:37 -07:00
commit e3820d0f9b
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
leiningen-core/src/leiningen/core/classpath.clj
View file

@ -220,14 +220,15 @@
(message-for (conj parents node)))
(defn- exclusion-for-range [node parents]
(let [top-level (second parents)
excluded-artifact (.getArtifact (.getDependency node))
exclusion (Exclusion. (.getGroupId excluded-artifact)
(.getArtifactId excluded-artifact) "*" "*")
exclusion-set (into #{exclusion} (.getExclusions
(.getDependency top-level)))
with-exclusion (.setExclusions (.getDependency top-level) exclusion-set)]
(dependency-str with-exclusion)))
(if-let [top-level (second parents)]
(let [excluded-artifact (.getArtifact (.getDependency node))
exclusion (Exclusion. (.getGroupId excluded-artifact)
(.getArtifactId excluded-artifact) "*" "*")
exclusion-set (into #{exclusion} (.getExclusions
(.getDependency top-level)))
with-exclusion (.setExclusions (.getDependency top-level) exclusion-set)]
(dependency-str with-exclusion))
""))
(defn- message-for-range [{:keys [node parents]}]
(str (message-for (conj parents node) :constraints) "\n"