From 3b9326465d71c03674249112802fe5bc4c2d9f5d Mon Sep 17 00:00:00 2001 From: Martin Klepsch Date: Tue, 9 Jan 2018 15:41:39 +0100 Subject: [PATCH] fix #502: boot.tmpdir/cp: pass file path to add-blob! (#675) --- CHANGES.md | 2 ++ boot/pod/src/boot/tmpdir.clj | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 1aa6b671..efd38829 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -40,7 +40,9 @@ and `technomancy` for the above explanation. - `fileset-diff` correctly handles nested data structures [#566][566] - Boot does not sign jars with classifiers [#625][625] - Allow clojure source jar onto the classpath [#654][654] +- Fix `boot.tmpdir/cp` [#502][502] +[502]: https://github.com/boot-clj/boot/pull/502 [598]: https://github.com/boot-clj/boot/pull/598 [625]: https://github.com/boot-clj/boot/pull/625 [629]: https://github.com/boot-clj/boot/pull/629 diff --git a/boot/pod/src/boot/tmpdir.clj b/boot/pod/src/boot/tmpdir.clj index 9dbc2f64..6bb6f37e 100644 --- a/boot/pod/src/boot/tmpdir.clj +++ b/boot/pod/src/boot/tmpdir.clj @@ -328,7 +328,7 @@ d' (dir dest-tmpfile)] (assert ((set (map file dirs)) d') (format "dest-dir not in dir set (%s)" d')) - (add-blob! blob src-file hash *hard-link*) + (add-blob! blob (.toPath src-file) hash *hard-link*) (assoc this :tree (merge tree {p' (assoc dest-tmpfile :id hash)}))))) ;; additional api functions ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;