Archived
Revert "lib/model: Handle filename conflicts on Windows."
This reverts commit 01e50eb3fa.
This commit is contained in:
1 parent
01e50eb3fa
commit
f5a310ad64
6 files changed
+1
-222
No files matched your search
@@ -130,14 +130,6 @@ func (w *walker) walk() (chan protocol.FileInfo, error) {
|
||||
filepath.Walk(w.Dir, hashFiles)
|
||||
} else {
|
||||
for _, sub := range w.Subs {
|
||||
if !osutil.IsDir(w.Dir, filepath.Dir(sub)) {
|
||||
l.Infoln("Skipping sub path that is not in a directory", w.Dir, sub)
|
||||
continue
|
||||
}
|
||||
if !osutil.CheckNameConflict(w.Dir, sub) {
|
||||
l.Infoln("Skipping sub path that collides", w.Dir, sub)
|
||||
continue
|
||||
}
|
||||
filepath.Walk(filepath.Join(w.Dir, sub), hashFiles)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user