Skip to content

Commit

Permalink
Fix partially composite profile setup
Browse files Browse the repository at this point in the history
Commit ecb7ed0 substituted
"composite-profile?" for the "map?" predicate in this conditional. This
change was a mistake; it made the mapping operation a no-op as composite
profiles (= vectors) do not themselves contain composite profiles. The
change was also unrelated to the stated purpose of the commit.

That change is undone here, "composite-profile?" is reverted back to
"map?".
  • Loading branch information
glts committed Jun 5, 2019
1 parent 7fb1d6b commit 683eff6
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions leiningen-core/src/leiningen/core/project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -380,8 +380,7 @@
(if (composite-profile? raw-profile)
;; TODO: drop support for partially-composite profiles in 3.0
(with-meta
(mapv #(cond-> % (composite-profile? %) setup-profile-with-empty)
raw-profile)
(mapv #(cond-> % (map? %) setup-profile-with-empty) raw-profile)
(meta raw-profile))
(let [empty-defaults (select-keys empty-meta-merge-defaults
(keys raw-profile))]
Expand Down

0 comments on commit 683eff6

Please sign in to comment.