Skip to content

Commit

Permalink
'freshen got confused by user profile settings. Fixed.
Browse files Browse the repository at this point in the history
  • Loading branch information
Chouser committed Jan 9, 2014
1 parent 375cb1f commit 35d7274
Showing 1 changed file with 13 additions and 9 deletions.
22 changes: 13 additions & 9 deletions src/leiningen/voom.clj
Expand Up @@ -546,7 +546,9 @@
(when (not-any? #{"--no-fetch"} args) (when (not-any? #{"--no-fetch"} args)
(fetch-all)) (fetch-all))
(let [prj-file-name (str (:root project) "/project.clj") (let [prj-file-name (str (:root project) "/project.clj")
old-deps (:dependencies project) ;; Read project.clj instead of taking lein's read of it, to be
;; as similar as possible to reading the tmp file later.
old-deps (:dependencies (project/read (str prj-file-name)))
repo-dbs (all-repo-dbs) repo-dbs (all-repo-dbs)
desired-new-deps (doall (map #(fresh-version repo-dbs %) old-deps))] desired-new-deps (doall (map #(fresh-version repo-dbs %) old-deps))]
(doseq [[[prj old-ver] [_ new-ver]] (map list old-deps desired-new-deps)] (doseq [[[prj old-ver] [_ new-ver]] (map list old-deps desired-new-deps)]
Expand All @@ -564,14 +566,16 @@
(spit tmp-file (spit tmp-file
(rewrite-project-file (slurp prj-file-name) replacement-map)) (rewrite-project-file (slurp prj-file-name) replacement-map))


(if (= desired-new-deps (:dependencies (project/read (str tmp-file)))) (let [new-deps (:dependencies (project/read (str tmp-file)))]
(.renameTo tmp-file (File. prj-file-name)) (if (= desired-new-deps new-deps)
(throw (ex-info (str "Freshen mis-fire. See " (.renameTo tmp-file (File. prj-file-name))
tmp-file " for attempted change.") (throw (ex-info (str "Freshen mis-fire. See "
{:old-deps old-deps tmp-file " for attempted change.")
:replacement-map replacement-map {:old-deps old-deps
:desired-new-deps desired-new-deps :replacement-map replacement-map
:tmp-file-name (str tmp-file)}))))))) :desired-new-deps desired-new-deps
:new-deps new-deps
:tmp-file-name (str tmp-file)}))))))))


(defn resolve-short-proj (defn resolve-short-proj
[dep projects] [dep projects]
Expand Down

0 comments on commit 35d7274

Please sign in to comment.