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

Load hooks inside reset-profiles. Fixes #740.

Browse source
This commit is contained in:
Phil Hagelberg 2012-08-22 11:40:51 -07:00
parent 4a6953c881
commit 00ee950ef9
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
leiningen-core/src/leiningen/core/project.clj
View file

@ -299,7 +299,8 @@
[project] [project]
(let [certs (mapcat ssl/read-certs (:certificates project)) (let [certs (mapcat ssl/read-certs (:certificates project))
context (ssl/make-sslcontext (into (ssl/default-trusted-certs) certs))] context (ssl/make-sslcontext (into (ssl/default-trusted-certs) certs))]
(ssl/register-scheme (ssl/https-scheme context)))) (ssl/register-scheme (ssl/https-scheme context))
project))
(defn- reset-profiles (defn- reset-profiles
"Compute a fresh version of the project map with middleware applied, including "Compute a fresh version of the project map with middleware applied, including
@ -314,7 +315,9 @@
(vary-meta merge {:without-profiles without-profiles (vary-meta merge {:without-profiles without-profiles
:included-profiles include-profiles :included-profiles include-profiles
:excluded-profiles exclude-profiles}) :excluded-profiles exclude-profiles})
(apply-middleware)))) (apply-middleware)
(load-certificates)
(load-hooks))))
(defn merge-profiles (defn merge-profiles
"Compute a fresh version of the project map with the given profiles merged "Compute a fresh version of the project map with the given profiles merged