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

Don't fail if bootclasspath deps list isn't found.

Browse source 
When this isn't present we should assume no files are on the bootclasspath.

Fixes #2369.
This commit is contained in:
Phil Hagelberg 2017-12-15 09:14:11 -08:00
parent 02c24865ee
commit 884189a798
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -404,8 +404,10 @@
(doseq [[_ {:keys [native-prefix file]}] snap-deps] (doseq [[_ {:keys [native-prefix file]}] snap-deps]
(extract-native-dep! native-path file native-prefix)))))) (extract-native-dep! native-path file native-prefix))))))
(def ^:private bootclasspath-deps (-> "leiningen/bootclasspath-deps.clj" (def ^:private bootclasspath-deps
io/resource slurp read-string)) (if-let [deps-file (io/resource "leiningen/bootclasspath-deps.clj")]
(slurp (read-string deps-file))
[]))
(defn- warn-conflicts (defn- warn-conflicts
"When using the bootclasspath (for boot speed), resources already on the "When using the bootclasspath (for boot speed), resources already on the