Merge pull request #629 from boot-clj/598-2

Implement visitFileFailed for mkvisitor

CHANGES.md

@@ -2,6 +2,13 @@
 
 ## master
 
+#### Fixed
+
+- When directories or files cannot be opened by boot, don't fail but log something in debug level [#598][598] & [#629][629]
+
+[598]: https://github.com/boot-clj/boot/pull/598
+[629]: https://github.com/boot-clj/boot/pull/629
+
 ## 2.7.2
 
 #### Improved

boot/pod/src/boot/tmpdir.clj

@@ -100,7 +100,10 @@
                    (add-blob! blob path i link)
                    (swap! tree assoc p (map->TmpFile (assoc m :path p :id i :hash h :time t))))
                  (catch java.nio.file.NoSuchFileException _
-                   (util/dbug* "Tmpdir: file not found: %s\n" (.toString p))))) )))))
+                   (util/dbug* "Tmpdir: file not found: %s\n" (.toString p)))))))
+      (visitFileFailed [^Path path ^java.io.IOException e]
+        (with-let [_ fs/skip-subtree]
+          (util/dbug* "Tmpdir: failed to visit: %s\n" (str (.relativize root path))))))))
 
 (defn- dir->tree!
   [^File dir ^File blob]
@@ -263,7 +266,7 @@
                              err? (fatal-conflict? dst)
                              this (or (and (not err?) this)
                                       (update-in this [:tree] dissoc p))]
-                         (if err? 
+                         (if err?
                            (util/warn "Merge conflict: not adding %s\n" p)
                            (do (util/trace* "Commit: adding   %s %s...\n" (id tmpf) p)
                                (file/hard-link src dst)))