File tree Expand file tree Collapse file tree
src/main/clojure/clojure/tools/build/tasks Expand file tree Collapse file tree Original file line number Diff line number Diff line change 124124 (Files/setLastModifiedTime (.toPath out-file) last-modified-time)))
125125
126126(defn- handle-conflict
127- [handlers last-modified-time buffer out-dir {:keys [state path] :as handler-params}]
127+ [handlers last-modified-time buffer out-dir {:keys [lib state path] :as handler-params}]
128128 (let [use-handler (loop [[[re handler] & hs] (dissoc handlers :default )]
129129 (if re
130130 (if (re-matches re path)
131131 handler
132132 (recur hs))
133133 (:default handlers)))]
134+ (when (= " META-INF/LICENSE.txt" path)
135+ (println " handle-conflict" (.getPath ^File out-dir) path lib (.getName (class use-handler))))
134136 (if use-handler
135137 (let [{new-state :state , write :write } (use-handler handler-params)]
136138 (when write
You can’t perform that action at this time.
0 commit comments