Skip to content

Commit 89d7ad1

Browse files
committed
more windows test debug
1 parent a0a01cf commit 89d7ad1

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

  • src/main/clojure/clojure/tools/build/tasks

src/main/clojure/clojure/tools/build/tasks/uber.clj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,13 +124,15 @@
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

0 commit comments

Comments
 (0)