fic/server
2
0
Fork 0
Code Issues Pull Requests 3 Releases Wiki Activity

sync: fix file merging when using symlinks

Browse Source
This commit is contained in:
nemunaire 2020-01-20 16:02:40 +01:00
parent 4e258cb30d
commit 823328ead2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/sync/importer_localfs.go
View File

@ -44,11 +44,11 @@ func (i LocalImporter) importFile(URI string, next func(string, string) (interfa
if i.exists(URI) {
os.Symlink(i.toURL(URI), dest)
return next(dest, URI)
} else {
os.Symlink(i.toURL(URI) + "_MERGED", dest)
return ImportFile(i, URI, next)
}
return next(dest, URI)
} else {
return ImportFile(i, URI, next)
}