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

Merge pull request #426 from hugoduncan/feature/add-warn-on-no-project-in-checkout

Browse source 
Add warning if a checkouts directory does not contain a project.clj
This commit is contained in:
Phil Hagelberg 2012-02-29 13:24:06 -08:00
commit 7f5c41d77f
1 changed files with 11 additions and 6 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

@ -8,12 +8,17 @@
;; Basically just for re-throwing a more comprehensible error.
(defn- read-dependency-project [root dep]
(let [project (.getAbsolutePath (io/file root "checkouts" dep "project.clj"))]
;; TODO: core.project and core.classpath currently rely upon each other *uk*
(require 'leiningen.core.project)
(try ((resolve 'leiningen.core.project/read) project [])
(catch Exception e
(throw (Exception. (format "Problem loading %s" project) e))))))
(let [project-file (io/file root "checkouts" dep "project.clj")]
(if (.exists project-file)
(let [project (.getAbsolutePath project-file)]
;; TODO: core.project and core.classpath currently rely upon each other *uk*
(require 'leiningen.core.project)
(try ((resolve 'leiningen.core.project/read) project [])
(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."))))
(defn- checkout-dep-paths [project dep dep-project]
(concat (:source-paths dep-project)