Browse files

keep track of :active-profiles when merging

This is a list of all named profiles that have been merged in, after
following composite profile. This is different from :included-profiles
which is the list of profiles before composite profiles have been
  • Loading branch information...
1 parent 5b76a2e commit 5893c1406aa41db473fac102a513812056016721 @ninjudd ninjudd committed Oct 9, 2012
Showing with 3 additions and 2 deletions.
  1. +3 −2 leiningen-core/src/leiningen/core/project.clj
5 leiningen-core/src/leiningen/core/project.clj
@@ -226,13 +226,14 @@
(let [result (get profiles profile)]
(when-not (or result (#{:provided :dev :user :test :production} profile))
(println "Warning: profile" profile "not found."))
- (lookup-profile profiles result))
+ (vary-meta (lookup-profile profiles result)
+ update-in [:active-profiles] (fnil conj []) profile))
;; composite profile
(vector? profile)
(apply-profiles {} (map (partial lookup-profile profiles) profile))
- :else profile))
+ :else (or profile {})))
(defn- warn-user-repos []
(when (->> (vals (user/profiles))

0 comments on commit 5893c14

Please sign in to comment.